Gets the two templates to work together
Merge pull request #1 from Matael/master

Gets the two templates to work together