add html escape
add version
Merge remote branch 'github/master'
escape html