Updated to Java 8
Minor fixed