Merge remote-tracking branch 'okennedy/master' into working
Fixed few warnings in BasicSolver
Merge branch 'working' into gurupras@buffalo.edu