Lergo-392 and review comments for lergo 340
Merge pull request #156 from lergo/lergo-392

Lergo-392 and review comments for lergo 340