Updated to Java 1.8