Merge pull request #2 from dmend/master

Fix typos
Fix typos in templates as well