lergo-174-final review comments
Merge pull request #86 from lergo/lergo-174-final

lergo-174-final review comments