Merge pull request #1 from ErwanBaud/develop

Develop
Merge pull request #2 from ErwanBaud/master

Merge pull request #1 from ErwanBaud/develop