Updated to build properly using Java 1.8.