Allow gzipped files
Merge branch 'fix' into gb_master