Fix #259

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Added javadoc

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>