Added Javadoc comments and generated javadoc