Add choice rules and options to external solver
Version 2.25
Merge branch 'master' of http://github.com/iensen/sparc