EndOfFileException really belongs to file, not exception
Merge branch 'master' into bounded