Image Bug Fix Attempt Two

Attempt Two
Bug Fix Three

Third Attempt
Merge remote-tracking branch 'origin/master' into gh-pages