* Added some javadoc comments