Solution Generator working!
Merge remote-tracking branch 'origin/master'
SolutionGenerator finished; various bugs fixed