Refresh issue #2209
Merge pull request #2334 from ghost1227/issue/2209

Docfixes