Issue #180

Pull request for issue #180.