Issue #222

Pull request for issue #222.