lergo-162-improvments
Merge pull request #62 from lergo/lergo-169-improvments

Lergo 169 improvments