Merge pull request #1 from vincent-clipet/master

Merge test
Merge pull request #2 from mpiffault/master

Merge pull request #1 from vincent-clipet/master