Fixed a gzip related bug
Merge remote-tracking branch 'origin/develop'