Updated javadoc
Added documentation