Added some support for IPv6, full support still lacking