Merge "Improve javadoc"