Optional cd zip

Yes the branch was from latest 'master'
I fixed this since actually we expect ',' char.
I am not clear with how we wrtie\read files with ',' in the file name