Merge fix to the autoloader
Templating done