Merge pull request #772 from zeroadam/TextToHTML