Merge pull request #13 from Martin819/master

Simplify 'noservices' condition