Thirth Commit of Rebmann Guillaume with the correction of the last bug