#20 Update to JAVA8