As received from markus
Merge branch 'master' of https://github.com/komahanb/solver