Synced up to Matts code.

Socket.h

@@ -86,7 +86,7 @@ namespace core {
       /// Write data to the socket.
       ///
 
-      int write(std::string data, Socket *sender);
+      int write(std::string data, Socket *sender = NULL);
       void write(char *buffer, int length);
 
       void output(std::stringstream &out);