Added PNG output support