fixing issues with missing @ in template
Merge pull request #24 from ppouliot/master

fixing issues with missing @ for variables in template