javadoc corrected
#121, #114 and #108 fix