File crawler bugs and improvement
Merge pull request #85 from emmanuel-keller/1.5

File crawler bugs and improvement