code cleaning
Merge branch 'master' into gh-pages
clean some code