Merge pull request #27 from fpaut/master