fixed lockup for recursive zipping
Merge branch 'dev' of github.com:xLegoz/marmoset into dev