Merge pull request #834 from narfbg/develop-zip

Improve the Zip library