Merge pull request #2 from thmsaurel/master

Merge thomas - master 2