adding to contrib and updating to 2.0rc1