Merge pull request #1 from matfed/master

Fixing velocity template issue
Merge pull request #2 from krzywojc/master

transfering changes from fork
velocity escaping improved