close #4
And some additionnal Javadoc....