Merge pull request #2110 from munjesi/docs_fixes