Upgraded argument processing :)
Merge branch 'zip-parsing'