Merge pull request #2 from thmsaurel/master

Merge thomas - master
Merge pull request #3 from thmsaurel/thomas

Merge pull request #2 from thmsaurel/master