made things less tiny
Merge branch 'master' into gh-pages