Master template cleanup
Removing prefix
Merge pull request #3 from brint/master

Master template cleanup