clean up and add zip support
Merge pull request #8 from jumoog/master

clean up and add zip support
Merge branch 'master' for Release_2.1.2-rc1