added javadoc
merge fix