Issue #164

Pull request for issue #164.