better handling of image centering
Merge branch 'master' into gh-pages