Work on stabilizing the public API
Merge branch 'feature/solver' into develop