working out the intro
Merge branch 'master' into gh-pages