issue #10, backend
Merge pull request #22 from ConcoMB/issue-10

issue #10, backend