Refactored how images are handled - now uses image id instead of lazy loading the image object. Fixed issue #35
Merge branch 'image_refactoring'