[BUGFIX] raw html output
Merge branch 'master' into hongchangjun