lergo-169-improvments
Merge pull request #61 from lergo/lergo-169-improvments

Lergo 169 improvments