Merge pull request #42 from fredjean/master