some bugs
Merge branch 'templating' of https://github.com/itdoors/sd into templating