2.0 version commit (minor fixes)