Minor doc modifications.  Fixes #29, fixes #30
Merge branch 'hotfix-issue29'