Updated to run against pandas master