redo method for drawing text using html
Merge remote-tracking branch 'origin/master'