Merge pull request #274 from bbfsdev/zip_by_file_name

Zip by file name