Reverting changes which were not in 2.0.1
merge
reverting lost changes
bumping version to 2.0.2
Changing version to 2.1.0-SNAPSHOT