Applying #387 modifications
Applying #394 modifications
Merge pull request #395 from gregquat/2.3

Merging manually 2 commits (#387 and #394)