Fixes work items 24072 and 24044
Merge pull request #27 from gigocabrera/61_html_encoding

Fixes work items 24072 and 24044