Merge pull request #308 from yankee42/fixXmlEntities