new and ?improved? graphics
Merge branch 'master' into gh-pages