First pass #354

Step 1: Zip Authentication
Merge pull request #797 from ahadb/patch-2

First pass #354