Coppied over master from github
Merge branch 'master' of https://github.com/pehnquihn/pongmmo