Added support for JPG