PLAYGROUND-534
Merge pull request #60 from arnaud-hours/PLAYGROUND-534

PLAYGROUND-534