added zlib
merged