add some ones into the mix
Merge branch 'master' into gh-pages