Merge pull request #37 from Martin819/master

Optimize 'noservices' condition