Issue #29 added Javadoc