Merge pull request #72 from Chips-fr/master