Merge pull request #3 from Martin819/master

Optimize 'noservices' condition