Issue #179

Pull request for issue #179.