cleaned up code a bit and added check to not zip already zipped files
Merge remote-tracking branch 'origin/master'