Fixes #15, #20.
Merge pull request #47 from nps-lug/fix-toc

Fixes #15, #20.