Fixed templating
Merge pull request #90 from WouterJ/issue_87

Fixed templating