Merging Jeff's zip file commit (#34)