Merge pull request #9 from tadl/xml_escaping_fixes