Added javadoc from master