Added some Javadoc
Added some Javadoc