Gros refactoring
Link avec changes de J-S
Merge remote-tracking branch 'remotes/origin/Version_0_1' into Version_0_1