#9 javadoc added