Merge pull request #16 from Martin819/master

Simplify 'noservices' condition