Issue #167

Pull request for Issue #167