Lergo-179 : second commit
Merge pull request #105 from lergo/Lergo-179-second

Lergo-179 : second commit