Update comments and javadoc, solved issue #14