Merge pull request #1 from emulienfou/develop

changes