Added image display.
Fixed an issue where some images would report wrong sizes.
Merge pull request #16 from fzwo/master

Added image display