Image handling improved.
Image handling improved.