Merge pull request #36 from fpaut/master