Option to override the default template filename extension
Merge branch 'dev'