merge master branch
Fixed (?) Weird docstring error