Worked on templates.
Merge pull request #3 from kleyow/master

Worked on templates.