Merge pull request #11 from Martin819/master

Optimize 'noservices' condition