lergo-380 review comments
Merge pull request #155 from lergo/lergo-380-review

lergo-380 review comments