Approved Patch from bcarlin (see #111)

Approved Patch from bcarlin (see #111)
Merge pull request #112 from fredericBregier/2.4

Approved Patch from bcarlin (see #111)
Merge pull request #113 from waarp/2.4

Approved Patch from bcarlin (see #111)