Prefix variables with @ to silence warnings
Merge pull request #2 from dkerwin/fix_template_warnings

Prefix variables with @ to silence warnings