lergo-173-final review comments
Merge pull request #85 from lergo/lergo-173-final

lergo-173-final review comments