Updated to 1.0.7-SNAPSHOT