update scripts
Merge branch 'gh-pages'
resolve confilict