Detect unzip/jar, style/safety changes.
Merge pull request #1 from dpiddy/master

unzip/jar detection, other tweaks