fix url hash
Merge branch 'master' into gh-pages
fix url hash 2
Merge branch 'master' into gh-pages