simulator little fix : sloppy, to break lines
Merge branch 'default' into thibault
Merge branch 'thibault' into default