correction de l'issue #25
Merge remote-tracking branch 'origin/indev' into indev