RE
Merge pull request #2 from Vice-Pre/master

Merge David and Vice-Pré branch #2