Fixed bugs, found even worse bugs.
Merge branch 'master' of github.com:Oblify/Server