Tentative commit
Merge pull request #1 from Moucheron/master

Tentative commit