Merge pull request #463 from heatherleaf/master

Doctests for CFG generation