Update to 2.10 & 0.3.0-SNAPSHOT