Issue #181

Pull request for issue #181.