Merge pull request #33 close from ChristopheGaston/master