Updated and prepared for building with Java 8. Yeah.