Merge pull request #1 from CosyVerif/master

Merge last changes
Merge pull request #2 from rgouicem/master

Merge pull request #1 from CosyVerif/master