Fix reading files
Merge branch 'master' into data-subset2