fixes images
Merge branch 'master' into gh-pages

Merging for update to working gh-pages deployment