Merge pull request #14 from AlexandreBeaulne/dev

Dev