modification with last version of DGtal + minor edit