add raw html support
Merge branch 'develop'