Merged Master, Added Socket.IO