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

lergo-339-second commit