fix variables in templates
fix variables in templates
Merge pull request #6 from rgevaert/master

Fixes for templating