Can now handle non-ipv4-addresses