Added Javadoc for Issue #52 & Issue #75