Making template vars explicit
Merge pull request #41 from dhensby/patch-1

Making template vars explicit