lergo-508,lergo-509,lergo-511 , Lergo-501 review comments
Merge pull request #180 from lergo/lergo-509

lergo-508,lergo-509,lergo-511 , Lergo-501 review comments