Treat .ico and .jpeg files as images
Merged #202 "Treat .ico and .jpeg files as images"