Making some updates to improve docs
Merge pull request #1004 from darkwing/doc-update

Making some updates to improve docs