use html-text if possible
Merge branch 'master' into jupis