Code merged. Added javadoc