Preparing for version 2.1-SNAPSHOT