Merge pull request #39 from fpaut/master