#95 added javadoc