Updated to Java 8 (hopefully)