Fixes on the recent documentation changes
Merge pull request #18 from essen/fixes-aug-9

Fixes aug 9