Added support for .tiff and .tif