Merge pull request #24 from mixkorshun/master

Config fixes
Merge pull request #25 from mixkorshun/master

Templating service fixes