Lergo -143 and fixing the functionality broken in build 141
Merge pull request #45 from lergo/lergo-143

Lergo 143