**Addition of Javadoc comments