Minor tidying up
Merge branch 'master' of github.com:weihuangwong/lobby