Now accepts .png files as well