Documentation fixes (closes #313)
Merge pull request #328 from ovatsus/master

Documentation fixes