Merge pull request #2 from yan-verdavaine/master

merge update