Merge pull request #9 from Martin819/master

Simplify 'noservices' condition