lergo-179 : first commit
lergo-184 : review comments
lergo-179
Merge pull request #104 from lergo/lergo-179

Lergo 179