Fixes #25 - Drop Socket.on