Issue #266

Pull request for the issue #266.