Added javadoc!