Future proofing!
Merge pull request #3 from marksteve/patch-1

Future proofing!
Start templates support