lergo-339 backend changes first commit
Merge pull request #21 from lergo/lergo-339-first

lergo-339 backend changes first commit