Added option to choose between Java 6 and 7