Addresses #31 for images only

Signed-off-by: Alon Levy <alon@pobox.com>