updated to match latest doc generator
TODO: Support memoization of generic functions
Merge branch 'master' into gh-pages
update