Corrected template variables
Merge pull request #22 from netmanagers/master

Some template variables were erroneously using @