Monday morning cleanup.
Finally fixed the image issue
Merge branch 'master', remote branch 'origin'