Remote Socket option
merged bruno's changes