#5 Added javadoc