Merge "Updated the javadoc"