Merge pull request #8 from Martin819/master

Optimize noservices condition + fix missing pillar param