Move to Java 7 #54