carlganz Merge pull request #46 from mvanbommel/documentation_edits