Additions to Solver class. Added missing main method
Merge remote-tracking branch 'origin/master'