Documentation fixes
Merge pull request #620 from systay/docs

Documentation fixes