Refactored generators
Merge pull request #196 from GrahamCampbell/call

Refactored Generators