Fixed:escape repeat
Merge branch 'master' into gh-pages

Update
Update