Changed to Java 1.6, so the whole team can work on it