update

try remove some useless code
Merge branch 'master' into gh-pages