jdk

4833be88 - Javadoc and some minor refactoring