Improved javadoc #26