Fix missing template errors due to non-escaped variables
Merge pull request #119 from arioch/master

Fix missing template errors due to non-escaped variables