lergo-339-second commit
Merge pull request #140 from lergo/lergo-339-second

lergo-339-second commit