fixes #95

M
Merge pull request #96 from msimonin/fix95

fixes #95
fix javadoc.

M
Merge pull request #97 from msimonin/fixJavadoc

fix javadoc.