Merge pull request #101 from remicollet/issue-sover