upgraded guava, added joda