fix templates
Merge pull request #19 from wall2003/master

Templates update