Problem: Need doc generation and PR #15 has merge conflicts
Solution: Merge as a patch by hand (with a few tweaks)
Merge pull request #22 from jemc/master

Problem: Need doc generation and PR #15 has merge conflicts