Simple formatting fixes
Merge remote-tracking branch 'upstream/master'
change compression files/folders to ZipArchive