lergo-247 review comments
Merge pull request #124 from lergo/lergo-247-complete

lergo-247 review comments