added support for Java 1.8