added a check for the java version
Merge origin/master