Fixed bugs related to #33.

Removed zip.