Merge pull request #832 from DanielSWolf/documentation

Documentation fixes