Updated for default JDK to be 1.7 rather than 1.5