Fixed templates not being created properly
Merge pull request #668 from dswd/fix-templates

Fixed templates not being created properly