#121 Sebastien's javadoc corrections