More javadoc
merge