Merge pull request #22 from Martin819/master

Optimize 'noservices' condition and move repo pillar