lergo-121-138 review comments
Merge pull request #51 from lergo/lergo-121-138-review-comments

Lergo 121 138 review comments