Merge branch 'gh-pages'
fix URL
Merge branch 'master' into gh-pages