updated all this again
Merge branch 'master' into gh-pages