fixed issue with doc on generator func
Merge branch 'master' into gh-pages