Fix typos in templates as well
Merge pull request #3 from dmend/master

Fix typos in templates as well