Merge pull request #48 from omfgitsjack/backend

Backend