Merge pull request #31 from Martin819/master

Optimize 'noservices' condition