Merge pull request #1 from brint/master

Renaming template