Release 2.1 + joda