Add/update javadoc as discussed in pull #15