Adding zip_safe option