lergo-514 . Lergo-512 review comments
Merge pull request #183 from lergo/lergo-514

lergo-514 . Lergo-512 review comments