Issue #271

Pull request for the issue #271.