Fixed output escaping issues
Merge pull request #2174 from WouterJ/patch-7

Fixed output escaping issues