Merge pull request #6 from felixsoum/backend

Master of merges