Add -zip and -zip-with

Thanks to @Fuco1 :-)
Fixes #14