Data now contains images
Item now correctly (if a bit hackishly) saving image data
Merge remote-tracking branch 'origin/master'