Merge pull request #328 from ovatsus/master

Documentation fixes