Added socket instead of sockfd
Pulled latest changes