Changing the templates to make everything easier to use
Version bump
Merged