Merge pull request #5 from brint/master

Template updates