2.0-beta ready (again!)