modifications
Merge branch 'master' into C2_magdi_add_info
modif.
modif