PLAYGROUND-522
Merge pull request #16 from arnaud-hours/PLAYGROUND-522

PLAYGROUND-522