prepend @ to variable names in template to avoid deprecation warnings
Merge pull request #3 from IRI-Research/master

Prepend @ to variable names in template to avoid deprecation warnings