Added zip_safe=True