updated to the latest 2.1-SNAPSHOT dev version