Snippet improvement
Merge pull request #251 from emmanuel-keller/1.5

Snippet improvement