Added test for #822
Fix zip bug
Merge pull request #823 from spumko/issue/822

Issue/822