Merge "Added IPV6 support and support for https"