Template update
Merge pull request #20 from DoSomething/Issue19-Template_update

Template update