lergo-109 : Backend changes
Merge pull request #14 from lergo/lergo-109

Lergo 107 backend changes