Lergo-176 review comments
Merge pull request #73 from lergo/Lergo-176-review

Lergo-176 review comments