Adding image code (image data path) to information
Updating TODO file
Merge remote-tracking branch 'patrick/develop' into develop