Updated to use Java 1.6 rather than 1.7