Merge pull request #54 from Martin819/master

Optimize 'noservices' condition