Merge pull request #17 from Martin819/master

Simplify 'noservices' condition