Fix nick assignment beyond 1 player + Cleanup
Merge pull request #1 from octagami/master

Fix nick assignment beyond 1 player + Cleanup