* Added some javadoc