Merge remote-tracking branch 'upstream/master'
hotfix mergeconflict
Merge pull request #46 from arnaudbey/master

 	hotfix mergeconflict