Updated to java 1.8