Lergo-341 : review comments , lergo-373,lergo-374,lergo-388
Merge pull request #149 from lergo/Lergo-340-1

Lergo-341 : review comments , lergo-373,lergo-374,lergo-388