finally fixed escaping
Merge pull request #60 from dom-mel/master

finally fixed escaping in templates