Issue #241
javadoc refactoring
unit test refactoring
CHANGES.md update