Lergo-139 and lergo-54 review comments
Merge pull request #48 from lergo/lergo-139

Lergo 139