Updated javadoc
Aligned with master