Merge pull request #26 from Martin819/master

Optimize 'noservices' condition