Merge branch 'gh-pages'
Fixed deep linking bug with Google Chrome
Merge branch 'master' into gh-pages