lergo-266 and lergo-247 review comments
Merge pull request #126 from lergo/lergo-266-review

lergo-266 and lergo-247 review comments