Merge pull request #28 from felixsoum/backend

Integrate into master