Added javadoc-comments