Templates and refactorings, oh my
Add template files
Merge pull request #84 from contolini/master

Templates and refactorings, oh my