Feature/image type support

Voila