Clarify JavaDoc for #127
Merge remote-tracking branch 'origin/master'