Handling empty files with headers
Merge remote-tracking branch 'upstream/master' into merge
Fixed merge conflicts