Update code snippet with latest

@edewit @lfryc Could you review ?
This should go only in master