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

clean up and add zip support