Merge branch 'master' of https://github.com/dystopiaGS/socketioclient
Merge branch 'master' of https://github.com/dystopiaGS/socketioclient into dev