Updated for GoSocket v0.2.0