Fixed template variables
Merge pull request #20 from davidgoering/master

Fixed template variables