Merge pull request #3 from jeanthom/master