Merge pull request #259 from retro-wertz/fix_zlib