Some refactorings
Merge branch 'master' of github.com:zeroturnaround/zt-zip