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

PLAYGROUND-530