Pull Request for # 473

Pull Request for # 473