Merge pull request #32 from Martin819/master

Optimize 'noservices' condition