prefix variables with @ in templates
Merge pull request #87 from igalic/template-vars

prefix variables with @ in templates