Changes made by Boris STOCKER (boris.stocker@openrsi.fr).