fix typo
Merge branch 'master' of github.com:zichun/multiplayr
added tests. fixed another typo