Merge pull request #40 from fpaut/master