javadoc v1
Merge pull request #452 from VincentCharpentier/Vincent

javadoc v1