final commit with javadoc comments