Merge pull request #32 from fpaut/master