Edited generator interface
Merge branch 'master' of https://github.com/boyshawn/CS4221