Merge pull request #29 from fpaut/master