Fixes EOF handling
Merge branch 'master' of github.com:DKFUNG/cs454