Regerated and corrected Javadoc