Merge pull request #1 from phillip-haydon/master

Initial compiling of template