Changes courtesy of Michael
Merge branch 'backend-new' of https://github.com/StickMen/KungFuRhino.git