Merge pull request #5 from Blopeur/dev

Dev