Merge pull request #7 from gustvgdt/master

Résolution des conflits?
Merge pull request #10 from hsandt/master

Recovery?