Merge branch 'gh-pages'
fixed stuff
Merge branch 'master' into gh-pages