Merge pull request #37 from fpaut/master