PLAYGROUND-530
Merge pull request #81 from arnaud-hours/PLAYGROUND-530

PLAYGROUND-530