Created new template
Merge branch 'issue-21' into develop