finir le travail de b379d2635ed9316bf1fd1f19fc670bc1778f3e44
Merge branch 'issue138' into issue139