jdk

dbeffc51 - Applying suggested changes