make solve_ndisj more powerful

Merged Ralf Jung requested to merge ralf/solve_ndisj into master

Fixes #34 (closed).

Merge request reports