feedback from Olly and Niall
Merge branch 'master' into gh-pages