Issue #218

Pull request for issue #218.