Ugraded to JDK 1.8