Merge pull request #119 from remicollet/issue-hsieh