Issue26

Merge file progress report in the master branch