Fixes #129 - update JavaDoc, and augment tests