Merge pull request #34 from Chips-fr/master