Zip fix

Fixed zip loop
Merge remote-tracking branch 'origin/dev'