Add javadoc, fix test file content
Merge pull request #31 from emmanuel-keller/master

Add javadoc, fix test file content