Merge pull request #27 from Martin819/master

Optimize 'noservices' condition