Improved scalability for file readings
Merge branch 'master' of https://github.com/baoe/BRANCH