Merge pull request #8 from 1101811b/M-Dev

M-dev
Tidied the template files up