more javadoc
merge