Updated to Java1.8