Fix solution table bug.
Merge remote-tracking branch 'origin/master' into fix_solution_table_bug
Merge pull request #25 from d2rk/fix_solution_table_bug

Fix solution table bug