changes by Benoît
subdir and file
Merge branch 'master' of https://github.com/rubenverbist/progit