No longer throws 500 errors
Merge branch 'master' of https://github.com/ponghub/ponghub-core