Merge pull request #32 from omfgitsjack/master

Update Backend to may 15 master