Merge pull request #116 from Alexpux/develop

Fix building with zlib