Played around with image file storage to no avail
Merge branch 'master' into steven