generator interface added
generator implementation
fixed up generator interface
improved matching of optional tokens in generator
added test for generator
added test for optional parameters
updated with prefix for optional params