Refactoring mostly and generator finally works
Merge pull request #2 from scoward/outputsolve

Refactoring mostly and generator finally works