Merge pull request #30 from fpaut/master