Updated to Java 1.7