Added socket information.
Pull from upstream.
Merge pull request #213 from arb/active-sockets

Added socket information.
Merged from upstream.