Fix issues with templates
Merge pull request #8 from Originate/template-fixes

Fix issues with templates [Fixes #4 #3 #2]