Merge pull request #49 from jacobwagner/master

fixed template files