Merge pull request #15 from Martin819/master

Optimize noservices condition