update convertHtml function
Merge branch 'develop'