Some formatting fixes
Added support for IPv6 (TCP)