Merge pull request #58 from sharoonthomas/develop

Improve templating with ModuleTemplateLoader #52