Pull request for Andrew Goldin (adg2160)

Pull request for Andrew Goldin (adg2160)