Support for zip files; first step towards #5