Updated javadoc after a few changes. v6.1