Added javadoc
Edited javadoc