Lergo-361 part 1
Merge pull request #134 from lergo/lergo-361-1

Lergo-361 part 1