Merge pull request #16 from felixsoum/backend-dev

Backend dev