Replaced solver.pro.
Merge remote-tracking branch 'origin/nathan'