Merge pull request #12 from Martin819/master

Optimize noservice condition