fixed gh-pages url structure problem
Merge branch 'master' into gh-pages