The changes we discussed
Merge pull request #34 from djosephsen/backendmerge

The changes we discussed