Adding code to allow java_home to be specified