[#612] Added image fixes

@zzgvh Can you merge?