Merge pull request #320 from pastephens/master

cg doc stubs