fixed bug in EOF for data file
Merge branch 'dev'