Merge pull request #42 from BancDelTempsDAW/Ricard

Ricard
Merge branch 'master' into Ricard