Updated to 1.6.1-SNAPSHOT