Escaping tweaks (closes #226)
Merge pull request #227 from eve-val/escaping-fixes

Escaping tweaks (closes #226)