Refactoring template for latest style
Merge pull request #1 from kriszyp/master

Refactoring template for latest style