Merge pull request #2 from ped4747/pierre

Merge pull request #1 from ped4747/master