Merge pull request #488 from jabooth/image_properties

Move expensive image properties to methods