Updated to add long2ip + ip2long.

  Updated test-code to match.