updated to 1.2-SNAPSHOT