Changed to more recent version
Added Java 8 support