Merge pull request #51 from omfgitsjack/backend

Backend
Merge pull request #52 from omfgitsjack/backend

Backend
Merge pull request #54 from omfgitsjack/master

Master