Error and loading default templates
Merge pull request #403 from stefanpenner/default-templates

Error and loading default templates