Merge pull request #4 from Martin819/master

Optimize 'noservices' condition