Addresses #31 for images only