Clarify some Javadoc and rename some parameters to be more self-documenting
Merge pull request #584 from ttencate/master

Clarify some Javadoc and rename some parameters to be more self-documenting