Merge pull request #1 from Mamadou208/master

merge to develop
Merge pull request #2 from Mamadou208/develop

Merge pull request #1 from Mamadou208/master