Change generator method to not depend on a fixed number of requested values.
Merge branch 'develop'