Upadate to version 2.1-SNAPSHOT towards next release