updated to 2013-05-10a Weatherwax