Updated to 1.1.7-SNAPSHOT