Added more extensive templates
Merge pull request #49 from Chive/feature/templates

Adds more extensive templates