#309, #312
Merge branches 'templating' and 'templating' of github.com:itdoors/sd into templating
#309, #312