Merge pull request #39 from Maaack/template-prep