Merge remote-tracking branch 'upstream/master'
hotfix merdouille
Merge pull request #38 from arnaudbey/master

hotfix merdouille