expensive image properties moved to methods
Merge remote-tracking branch 'upstream/master'
Merge pull request #488 from jabooth/image_properties

Move expensive image properties to methods