Provide more helpful base templates
Merge pull request #34 from nephila/feature/templates_fix

Provide more helpful base templates
Fix #31