Merge pull request #109 from iKevinY/doc-fixes

Documentation Fixes