[gh-387] Pull Request.

Pull request for issue 387.