backend - code review
Merge pull request #1 from erkobridee/master

backend - code review