Added preliminary support for IPv6