Merge pull request #18 from Winston-Chan/nathan

Cleaned up Solver so it will be easier to debug.
Fixed results for wrongtooneartask