diff --git a/src/core/lib/IP.mjs b/src/core/lib/IP.mjs
index c97f87ab..59cc8fce 100644
--- a/src/core/lib/IP.mjs
+++ b/src/core/lib/IP.mjs
@@ -336,16 +336,23 @@ export function ipv4ToStr(ipInt) {
 
 
 /**
- * Converts an IPv6 address from string format to numerical array format.
+ * Converts an IPv6 address from string format to numerical format.
  *
  * @param {string} ipStr
- * @returns {number[]}
+ * @param {boolean} retArr If true, an array is returned. If false, a BigInt is returned.
+ * @returns {(number[]|number)}
  *
  * @example
  * // returns [65280, 0, 0, 0, 0, 0, 4369, 8738]
  * strToIpv6("ff00::1111:2222");
+ *
+ * // returns 3.3895313892515355e+38
+ * strToIpv6("ff00::1111:2222", false);
  */
-export function strToIpv6(ipStr) {
+export function strToIpv6(ipStr, retArr=true) {
+    if (retArr === false) {
+        return Number("0x" + expandIpv6(ipStr).replace(/:/g, ""));
+    }
     let j = 0;
     const blocks = ipStr.split(":"),
         numBlocks = parseBlocks(blocks),
@@ -378,6 +385,49 @@ export function strToIpv6(ipStr) {
     }
 }
 
+/**
+     * Expands an IPv6 address in string format to its 'longhand' equivalent.
+     *
+     * @param {string} ipStr
+     * @returns {string}
+     *
+     * @example
+     * // returns "5555:126f:0000:0000:0000:0000:0000:0001"
+     * expandIpv6("5555:126f::1");
+     */
+export function expandIpv6(ipStr) {
+    const padHex = function (ipStr) {
+        if (ipStr.length === 39) {
+            return ipStr;
+        }
+        const blockArray = ipStr.split(":");
+        let reconstructed = "";
+        blockArray.forEach((a) => {
+            for (let i = a.length; i < 4; i++) {
+                reconstructed += "0";
+            }
+            reconstructed += a + ":";
+        });
+        return reconstructed.substring(0, reconstructed.length - 1);
+    };
+    ipStr = padHex(ipStr);
+    const doubleColonOffset = ipStr.search("::");
+    if (doubleColonOffset === -1) {
+        return ipStr;
+    }
+    const totalBlocks = ipStr.match(/:/g).length - (ipStr.startsWith(":") || ipStr.endsWith(":")),
+        reqBlocks = 8 - totalBlocks;
+    let expandedBlocks = (ipStr.startsWith(":") ? "" : ":") + "0000";
+    for (let i = 1; i < reqBlocks; i++) {
+        expandedBlocks += ":0000";
+    }
+    ipStr = ipStr.substring(0, doubleColonOffset) + expandedBlocks + ":" + ipStr.substring(doubleColonOffset + 2);
+    if (ipStr.endsWith(":")) {
+        ipStr = ipStr.substring(0, ipStr.length - 1);
+    }
+    return padHex(ipStr);
+}
+
 /**
  * Converts an IPv6 address from numerical array format to string format.
  *
diff --git a/src/core/operations/ParseIPv6Address.mjs b/src/core/operations/ParseIPv6Address.mjs
index f2141e01..0beaa6d3 100644
--- a/src/core/operations/ParseIPv6Address.mjs
+++ b/src/core/operations/ParseIPv6Address.mjs
@@ -38,235 +38,233 @@ class ParseIPv6Address extends Operation {
     run(input, args) {
         let match,
             output = "";
+        if (!(match = IPV6_REGEX.exec(input))) {
+            throw new OperationError("Invalid IPv6 address.");
+        }
+        const ipv6 = strToIpv6(match[1]),
+            longhand = ipv6ToStr(ipv6),
+            shorthand = ipv6ToStr(ipv6, true);
 
-        if ((match = IPV6_REGEX.exec(input))) {
-            const ipv6 = strToIpv6(match[1]),
-                longhand = ipv6ToStr(ipv6),
-                shorthand = ipv6ToStr(ipv6, true);
+        output += "Longhand:  " + longhand + "\nShorthand: " + shorthand + "\n";
 
-            output += "Longhand:  " + longhand + "\nShorthand: " + shorthand + "\n";
+        // Detect reserved addresses
+        if (shorthand === "::") {
+            // Unspecified address
+            output += "\nUnspecified address corresponding to 0.0.0.0/32 in IPv4.";
+            output += "\nUnspecified address range: ::/128";
+        } else if (shorthand === "::1") {
+            // Loopback address
+            output += "\nLoopback address to the local host corresponding to 127.0.0.1/8 in IPv4.";
+            output += "\nLoopback addresses range: ::1/128";
+        } else if (ipv6[0] === 0 && ipv6[1] === 0 && ipv6[2] === 0 &&
+            ipv6[3] === 0 && ipv6[4] === 0 && ipv6[5] === 0xffff) {
+            // IPv4-mapped IPv6 address
+            output += "\nIPv4-mapped IPv6 address detected. IPv6 clients will be handled natively by default, and IPv4 clients appear as IPv6 clients at their IPv4-mapped IPv6 address.";
+            output += "\nMapped IPv4 address: " + ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
+            output += "\nIPv4-mapped IPv6 addresses range: ::ffff:0:0/96";
+        } else if (ipv6[0] === 0 && ipv6[1] === 0 && ipv6[2] === 0 &&
+            ipv6[3] === 0 && ipv6[4] === 0xffff && ipv6[5] === 0) {
+            // IPv4-translated address
+            output += "\nIPv4-translated address detected. Used by Stateless IP/ICMP Translation (SIIT). See RFCs 6145 and 6052 for more details.";
+            output += "\nTranslated IPv4 address: " + ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
+            output += "\nIPv4-translated addresses range: ::ffff:0:0:0/96";
+        } else if (ipv6[0] === 0x100) {
+            // Discard prefix per RFC 6666
+            output += "\nDiscard prefix detected. This is used when forwarding traffic to a sinkhole router to mitigate the effects of a denial-of-service attack. See RFC 6666 for more details.";
+            output += "\nDiscard range: 100::/64";
+        } else if (ipv6[0] === 0x64 && ipv6[1] === 0xff9b && ipv6[2] === 0 &&
+            ipv6[3] === 0 && ipv6[4] === 0 && ipv6[5] === 0) {
+            // IPv4/IPv6 translation per RFC 6052
+            output += "\n'Well-Known' prefix for IPv4/IPv6 translation detected. See RFC 6052 for more details.";
+            output += "\nTranslated IPv4 address: " + ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
+            output += "\n'Well-Known' prefix range: 64:ff9b::/96";
+        } else if (ipv6[0] === 0x2001 && ipv6[1] === 0) {
+            // Teredo tunneling
+            output += "\nTeredo tunneling IPv6 address detected\n";
+            const serverIpv4  = (ipv6[2] << 16) + ipv6[3],
+                udpPort     = (~ipv6[5]) & 0xffff,
+                clientIpv4  = ~((ipv6[6] << 16) + ipv6[7]),
+                flagCone    = (ipv6[4] >>> 15) & 1,
+                flagR       = (ipv6[4] >>> 14) & 1,
+                flagRandom1 = (ipv6[4] >>> 10) & 15,
+                flagUg      = (ipv6[4] >>> 8) & 3,
+                flagRandom2 = ipv6[4] & 255;
 
-            // Detect reserved addresses
-            if (shorthand === "::") {
-                // Unspecified address
-                output += "\nUnspecified address corresponding to 0.0.0.0/32 in IPv4.";
-                output += "\nUnspecified address range: ::/128";
-            } else if (shorthand === "::1") {
-                // Loopback address
-                output += "\nLoopback address to the local host corresponding to 127.0.0.1/8 in IPv4.";
-                output += "\nLoopback addresses range: ::1/128";
-            } else if (ipv6[0] === 0 && ipv6[1] === 0 && ipv6[2] === 0 &&
-                ipv6[3] === 0 && ipv6[4] === 0 && ipv6[5] === 0xffff) {
-                // IPv4-mapped IPv6 address
-                output += "\nIPv4-mapped IPv6 address detected. IPv6 clients will be handled natively by default, and IPv4 clients appear as IPv6 clients at their IPv4-mapped IPv6 address.";
-                output += "\nMapped IPv4 address: " + ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
-                output += "\nIPv4-mapped IPv6 addresses range: ::ffff:0:0/96";
-            } else if (ipv6[0] === 0 && ipv6[1] === 0 && ipv6[2] === 0 &&
-                ipv6[3] === 0 && ipv6[4] === 0xffff && ipv6[5] === 0) {
-                // IPv4-translated address
-                output += "\nIPv4-translated address detected. Used by Stateless IP/ICMP Translation (SIIT). See RFCs 6145 and 6052 for more details.";
-                output += "\nTranslated IPv4 address: " + ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
-                output += "\nIPv4-translated addresses range: ::ffff:0:0:0/96";
-            } else if (ipv6[0] === 0x100) {
-                // Discard prefix per RFC 6666
-                output += "\nDiscard prefix detected. This is used when forwarding traffic to a sinkhole router to mitigate the effects of a denial-of-service attack. See RFC 6666 for more details.";
-                output += "\nDiscard range: 100::/64";
-            } else if (ipv6[0] === 0x64 && ipv6[1] === 0xff9b && ipv6[2] === 0 &&
-                ipv6[3] === 0 && ipv6[4] === 0 && ipv6[5] === 0) {
-                // IPv4/IPv6 translation per RFC 6052
-                output += "\n'Well-Known' prefix for IPv4/IPv6 translation detected. See RFC 6052 for more details.";
-                output += "\nTranslated IPv4 address: " + ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
-                output += "\n'Well-Known' prefix range: 64:ff9b::/96";
-            } else if (ipv6[0] === 0x2001 && ipv6[1] === 0) {
-                // Teredo tunneling
-                output += "\nTeredo tunneling IPv6 address detected\n";
-                const serverIpv4  = (ipv6[2] << 16) + ipv6[3],
-                    udpPort     = (~ipv6[5]) & 0xffff,
-                    clientIpv4  = ~((ipv6[6] << 16) + ipv6[7]),
-                    flagCone    = (ipv6[4] >>> 15) & 1,
-                    flagR       = (ipv6[4] >>> 14) & 1,
-                    flagRandom1 = (ipv6[4] >>> 10) & 15,
-                    flagUg      = (ipv6[4] >>> 8) & 3,
-                    flagRandom2 = ipv6[4] & 255;
+            output += "\nServer IPv4 address: " + ipv4ToStr(serverIpv4) +
+                "\nClient IPv4 address: " + ipv4ToStr(clientIpv4) +
+                "\nClient UDP port:     " + udpPort +
+                "\nFlags:" +
+                "\n\tCone:    " + flagCone;
 
-                output += "\nServer IPv4 address: " + ipv4ToStr(serverIpv4) +
-                    "\nClient IPv4 address: " + ipv4ToStr(clientIpv4) +
-                    "\nClient UDP port:     " + udpPort +
-                    "\nFlags:" +
-                    "\n\tCone:    " + flagCone;
-
-                if (flagCone) {
-                    output += " (Client is behind a cone NAT)";
-                } else {
-                    output += " (Client is not behind a cone NAT)";
-                }
-
-                output += "\n\tR:       " + flagR;
-
-                if (flagR) {
-                    output += " Error: This flag should be set to 0. See RFC 5991 and RFC 4380.";
-                }
-
-                output += "\n\tRandom1: " + Utils.bin(flagRandom1, 4) +
-                    "\n\tUG:      " + Utils.bin(flagUg, 2);
-
-                if (flagUg) {
-                    output += " Error: This flag should be set to 00. See RFC 4380.";
-                }
-
-                output += "\n\tRandom2: " + Utils.bin(flagRandom2, 8);
-
-                if (!flagR && !flagUg && flagRandom1 && flagRandom2) {
-                    output += "\n\nThis is a valid Teredo address which complies with RFC 4380 and RFC 5991.";
-                } else if (!flagR && !flagUg) {
-                    output += "\n\nThis is a valid Teredo address which complies with RFC 4380, however it does not comply with RFC 5991 (Teredo Security Updates) as there are no randomised bits in the flag field.";
-                } else {
-                    output += "\n\nThis is an invalid Teredo address.";
-                }
-                output += "\n\nTeredo prefix range: 2001::/32";
-            } else if (ipv6[0] === 0x2001 && ipv6[1] === 0x2 && ipv6[2] === 0) {
-                // Benchmarking
-                output += "\nAssigned to the Benchmarking Methodology Working Group (BMWG) for benchmarking IPv6. Corresponds to 198.18.0.0/15 for benchmarking IPv4. See RFC 5180 for more details.";
-                output += "\nBMWG range: 2001:2::/48";
-            } else if (ipv6[0] === 0x2001 && ipv6[1] >= 0x10 && ipv6[1] <= 0x1f) {
-                // ORCHIDv1
-                output += "\nDeprecated, previously ORCHIDv1 (Overlay Routable Cryptographic Hash Identifiers).\nORCHIDv1 range: 2001:10::/28\nORCHIDv2 now uses 2001:20::/28.";
-            } else if (ipv6[0] === 0x2001 && ipv6[1] >= 0x20 && ipv6[1] <= 0x2f) {
-                // ORCHIDv2
-                output += "\nORCHIDv2 (Overlay Routable Cryptographic Hash Identifiers).\nThese are non-routed IPv6 addresses used for Cryptographic Hash Identifiers.";
-                output += "\nORCHIDv2 range: 2001:20::/28";
-            } else if (ipv6[0] === 0x2001 && ipv6[1] === 0xdb8) {
-                // Documentation
-                output += "\nThis is a documentation IPv6 address. This range should be used whenever an example IPv6 address is given or to model networking scenarios. Corresponds to 192.0.2.0/24, 198.51.100.0/24, and 203.0.113.0/24 in IPv4.";
-                output += "\nDocumentation range: 2001:db8::/32";
-            } else if (ipv6[0] === 0x2002) {
-                // 6to4
-                output += "\n6to4 transition IPv6 address detected. See RFC 3056 for more details." +
-                    "\n6to4 prefix range: 2002::/16";
-
-                const v4Addr = ipv4ToStr((ipv6[1] << 16) + ipv6[2]),
-                    slaId = ipv6[3],
-                    interfaceIdStr = ipv6[4].toString(16) + ipv6[5].toString(16) + ipv6[6].toString(16) + ipv6[7].toString(16),
-                    interfaceId = new BigNumber(interfaceIdStr, 16);
-
-                output += "\n\nEncapsulated IPv4 address: " + v4Addr +
-                    "\nSLA ID: " + slaId +
-                    "\nInterface ID (base 16): " + interfaceIdStr +
-                    "\nInterface ID (base 10): " + interfaceId.toString();
-            } else if (ipv6[0] >= 0xfc00 && ipv6[0] <= 0xfdff) {
-                // Unique local address
-                output += "\nThis is a unique local address comparable to the IPv4 private addresses 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16. See RFC 4193 for more details.";
-                output += "\nUnique local addresses range: fc00::/7";
-            } else if (ipv6[0] >= 0xfe80 && ipv6[0] <= 0xfebf) {
-                // Link-local address
-                output += "\nThis is a link-local address comparable to the auto-configuration addresses 169.254.0.0/16 in IPv4.";
-                output += "\nLink-local addresses range: fe80::/10";
-            } else if (ipv6[0] >= 0xff00) {
-                // Multicast
-                output += "\nThis is a reserved multicast address.";
-                output += "\nMulticast addresses range: ff00::/8";
-
-                switch (ipv6[0]) {
-                    case 0xff01:
-                        output += "\n\nReserved Multicast Block for Interface Local Scope";
-                        break;
-                    case 0xff02:
-                        output += "\n\nReserved Multicast Block for Link Local Scope";
-                        break;
-                    case 0xff03:
-                        output += "\n\nReserved Multicast Block for Realm Local Scope";
-                        break;
-                    case 0xff04:
-                        output += "\n\nReserved Multicast Block for Admin Local Scope";
-                        break;
-                    case 0xff05:
-                        output += "\n\nReserved Multicast Block for Site Local Scope";
-                        break;
-                    case 0xff08:
-                        output += "\n\nReserved Multicast Block for Organisation Local Scope";
-                        break;
-                    case 0xff0e:
-                        output += "\n\nReserved Multicast Block for Global Scope";
-                        break;
-                }
-
-                if (ipv6[6] === 1) {
-                    if (ipv6[7] === 2) {
-                        output += "\nReserved Multicast Address for 'All DHCP Servers and Relay Agents (defined in RFC3315)'";
-                    } else if (ipv6[7] === 3) {
-                        output += "\nReserved Multicast Address for 'All LLMNR Hosts (defined in RFC4795)'";
-                    }
-                } else {
-                    switch (ipv6[7]) {
-                        case 1:
-                            output += "\nReserved Multicast Address for 'All nodes'";
-                            break;
-                        case 2:
-                            output += "\nReserved Multicast Address for 'All routers'";
-                            break;
-                        case 5:
-                            output += "\nReserved Multicast Address for 'OSPFv3 - All OSPF routers'";
-                            break;
-                        case 6:
-                            output += "\nReserved Multicast Address for 'OSPFv3 - All Designated Routers'";
-                            break;
-                        case 8:
-                            output += "\nReserved Multicast Address for 'IS-IS for IPv6 Routers'";
-                            break;
-                        case 9:
-                            output += "\nReserved Multicast Address for 'RIP Routers'";
-                            break;
-                        case 0xa:
-                            output += "\nReserved Multicast Address for 'EIGRP Routers'";
-                            break;
-                        case 0xc:
-                            output += "\nReserved Multicast Address for 'Simple Service Discovery Protocol'";
-                            break;
-                        case 0xd:
-                            output += "\nReserved Multicast Address for 'PIM Routers'";
-                            break;
-                        case 0x16:
-                            output += "\nReserved Multicast Address for 'MLDv2 Reports (defined in RFC3810)'";
-                            break;
-                        case 0x6b:
-                            output += "\nReserved Multicast Address for 'Precision Time Protocol v2 Peer Delay Measurement Messages'";
-                            break;
-                        case 0xfb:
-                            output += "\nReserved Multicast Address for 'Multicast DNS'";
-                            break;
-                        case 0x101:
-                            output += "\nReserved Multicast Address for 'Network Time Protocol'";
-                            break;
-                        case 0x108:
-                            output += "\nReserved Multicast Address for 'Network Information Service'";
-                            break;
-                        case 0x114:
-                            output += "\nReserved Multicast Address for 'Experiments'";
-                            break;
-                        case 0x181:
-                            output += "\nReserved Multicast Address for 'Precision Time Protocol v2 Messages (exc. Peer Delay)'";
-                            break;
-                    }
-                }
+            if (flagCone) {
+                output += " (Client is behind a cone NAT)";
+            } else {
+                output += " (Client is not behind a cone NAT)";
             }
 
+            output += "\n\tR:       " + flagR;
 
-            // Detect possible EUI-64 addresses
-            if (((ipv6[5] & 0xff) === 0xff) && (ipv6[6] >>> 8 === 0xfe)) {
-                output += "\n\nThis IPv6 address contains a modified EUI-64 address, identified by the presence of FF:FE in the 12th and 13th octets.";
-
-                const intIdent = Utils.hex(ipv6[4] >>> 8) + ":" + Utils.hex(ipv6[4] & 0xff) + ":" +
-                    Utils.hex(ipv6[5] >>> 8) + ":" + Utils.hex(ipv6[5] & 0xff) + ":" +
-                    Utils.hex(ipv6[6] >>> 8) + ":" + Utils.hex(ipv6[6] & 0xff) + ":" +
-                    Utils.hex(ipv6[7] >>> 8) + ":" + Utils.hex(ipv6[7] & 0xff),
-                    mac = Utils.hex((ipv6[4] >>> 8) ^ 2) + ":" + Utils.hex(ipv6[4] & 0xff) + ":" +
-                    Utils.hex(ipv6[5] >>> 8) + ":" + Utils.hex(ipv6[6] & 0xff) + ":" +
-                    Utils.hex(ipv6[7] >>> 8) + ":" + Utils.hex(ipv6[7] & 0xff);
-                output += "\nInterface identifier: " + intIdent +
-                    "\nMAC address:          " + mac;
+            if (flagR) {
+                output += " Error: This flag should be set to 0. See RFC 5991 and RFC 4380.";
             }
-        } else {
-            throw new OperationError("Invalid IPv6 address");
+
+            output += "\n\tRandom1: " + Utils.bin(flagRandom1, 4) +
+                "\n\tUG:      " + Utils.bin(flagUg, 2);
+
+            if (flagUg) {
+                output += " Error: This flag should be set to 00. See RFC 4380.";
+            }
+
+            output += "\n\tRandom2: " + Utils.bin(flagRandom2, 8);
+
+            if (!flagR && !flagUg && flagRandom1 && flagRandom2) {
+                output += "\n\nThis is a valid Teredo address which complies with RFC 4380 and RFC 5991.";
+            } else if (!flagR && !flagUg) {
+                output += "\n\nThis is a valid Teredo address which complies with RFC 4380, however it does not comply with RFC 5991 (Teredo Security Updates) as there are no randomised bits in the flag field.";
+            } else {
+                output += "\n\nThis is an invalid Teredo address.";
+            }
+            output += "\n\nTeredo prefix range: 2001::/32";
+        } else if (ipv6[0] === 0x2001 && ipv6[1] === 0x2 && ipv6[2] === 0) {
+            // Benchmarking
+            output += "\nAssigned to the Benchmarking Methodology Working Group (BMWG) for benchmarking IPv6. Corresponds to 198.18.0.0/15 for benchmarking IPv4. See RFC 5180 for more details.";
+            output += "\nBMWG range: 2001:2::/48";
+        } else if (ipv6[0] === 0x2001 && ipv6[1] >= 0x10 && ipv6[1] <= 0x1f) {
+            // ORCHIDv1
+            output += "\nDeprecated, previously ORCHIDv1 (Overlay Routable Cryptographic Hash Identifiers).\nORCHIDv1 range: 2001:10::/28\nORCHIDv2 now uses 2001:20::/28.";
+        } else if (ipv6[0] === 0x2001 && ipv6[1] >= 0x20 && ipv6[1] <= 0x2f) {
+            // ORCHIDv2
+            output += "\nORCHIDv2 (Overlay Routable Cryptographic Hash Identifiers).\nThese are non-routed IPv6 addresses used for Cryptographic Hash Identifiers.";
+            output += "\nORCHIDv2 range: 2001:20::/28";
+        } else if (ipv6[0] === 0x2001 && ipv6[1] === 0xdb8) {
+            // Documentation
+            output += "\nThis is a documentation IPv6 address. This range should be used whenever an example IPv6 address is given or to model networking scenarios. Corresponds to 192.0.2.0/24, 198.51.100.0/24, and 203.0.113.0/24 in IPv4.";
+            output += "\nDocumentation range: 2001:db8::/32";
+        } else if (ipv6[0] === 0x2002) {
+            // 6to4
+            output += "\n6to4 transition IPv6 address detected. See RFC 3056 for more details." +
+                "\n6to4 prefix range: 2002::/16";
+
+            const v4Addr = ipv4ToStr((ipv6[1] << 16) + ipv6[2]),
+                slaId = ipv6[3],
+                interfaceIdStr = ipv6[4].toString(16) + ipv6[5].toString(16) + ipv6[6].toString(16) + ipv6[7].toString(16),
+                interfaceId = new BigNumber(interfaceIdStr, 16);
+
+            output += "\n\nEncapsulated IPv4 address: " + v4Addr +
+                "\nSLA ID: " + slaId +
+                "\nInterface ID (base 16): " + interfaceIdStr +
+                "\nInterface ID (base 10): " + interfaceId.toString();
+        } else if (ipv6[0] >= 0xfc00 && ipv6[0] <= 0xfdff) {
+            // Unique local address
+            output += "\nThis is a unique local address comparable to the IPv4 private addresses 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16. See RFC 4193 for more details.";
+            output += "\nUnique local addresses range: fc00::/7";
+        } else if (ipv6[0] >= 0xfe80 && ipv6[0] <= 0xfebf) {
+            // Link-local address
+            output += "\nThis is a link-local address comparable to the auto-configuration addresses 169.254.0.0/16 in IPv4.";
+            output += "\nLink-local addresses range: fe80::/10";
+        } else if (ipv6[0] >= 0xff00) {
+            // Multicast
+            output += "\nThis is a reserved multicast address.";
+            output += "\nMulticast addresses range: ff00::/8";
+
+            switch (ipv6[0]) {
+                case 0xff01:
+                    output += "\n\nReserved Multicast Block for Interface Local Scope";
+                    break;
+                case 0xff02:
+                    output += "\n\nReserved Multicast Block for Link Local Scope";
+                    break;
+                case 0xff03:
+                    output += "\n\nReserved Multicast Block for Realm Local Scope";
+                    break;
+                case 0xff04:
+                    output += "\n\nReserved Multicast Block for Admin Local Scope";
+                    break;
+                case 0xff05:
+                    output += "\n\nReserved Multicast Block for Site Local Scope";
+                    break;
+                case 0xff08:
+                    output += "\n\nReserved Multicast Block for Organisation Local Scope";
+                    break;
+                case 0xff0e:
+                    output += "\n\nReserved Multicast Block for Global Scope";
+                    break;
+            }
+
+            if (ipv6[6] === 1) {
+                if (ipv6[7] === 2) {
+                    output += "\nReserved Multicast Address for 'All DHCP Servers and Relay Agents (defined in RFC3315)'";
+                } else if (ipv6[7] === 3) {
+                    output += "\nReserved Multicast Address for 'All LLMNR Hosts (defined in RFC4795)'";
+                }
+            } else {
+                switch (ipv6[7]) {
+                    case 1:
+                        output += "\nReserved Multicast Address for 'All nodes'";
+                        break;
+                    case 2:
+                        output += "\nReserved Multicast Address for 'All routers'";
+                        break;
+                    case 5:
+                        output += "\nReserved Multicast Address for 'OSPFv3 - All OSPF routers'";
+                        break;
+                    case 6:
+                        output += "\nReserved Multicast Address for 'OSPFv3 - All Designated Routers'";
+                        break;
+                    case 8:
+                        output += "\nReserved Multicast Address for 'IS-IS for IPv6 Routers'";
+                        break;
+                    case 9:
+                        output += "\nReserved Multicast Address for 'RIP Routers'";
+                        break;
+                    case 0xa:
+                        output += "\nReserved Multicast Address for 'EIGRP Routers'";
+                        break;
+                    case 0xc:
+                        output += "\nReserved Multicast Address for 'Simple Service Discovery Protocol'";
+                        break;
+                    case 0xd:
+                        output += "\nReserved Multicast Address for 'PIM Routers'";
+                        break;
+                    case 0x16:
+                        output += "\nReserved Multicast Address for 'MLDv2 Reports (defined in RFC3810)'";
+                        break;
+                    case 0x6b:
+                        output += "\nReserved Multicast Address for 'Precision Time Protocol v2 Peer Delay Measurement Messages'";
+                        break;
+                    case 0xfb:
+                        output += "\nReserved Multicast Address for 'Multicast DNS'";
+                        break;
+                    case 0x101:
+                        output += "\nReserved Multicast Address for 'Network Time Protocol'";
+                        break;
+                    case 0x108:
+                        output += "\nReserved Multicast Address for 'Network Information Service'";
+                        break;
+                    case 0x114:
+                        output += "\nReserved Multicast Address for 'Experiments'";
+                        break;
+                    case 0x181:
+                        output += "\nReserved Multicast Address for 'Precision Time Protocol v2 Messages (exc. Peer Delay)'";
+                        break;
+                }
+            }
+        }
+
+
+        // Detect possible EUI-64 addresses
+        if (((ipv6[5] & 0xff) === 0xff) && (ipv6[6] >>> 8 === 0xfe)) {
+            output += "\n\nThis IPv6 address contains a modified EUI-64 address, identified by the presence of FF:FE in the 12th and 13th octets.";
+
+            const intIdent = Utils.hex(ipv6[4] >>> 8) + ":" + Utils.hex(ipv6[4] & 0xff) + ":" +
+                Utils.hex(ipv6[5] >>> 8) + ":" + Utils.hex(ipv6[5] & 0xff) + ":" +
+                Utils.hex(ipv6[6] >>> 8) + ":" + Utils.hex(ipv6[6] & 0xff) + ":" +
+                Utils.hex(ipv6[7] >>> 8) + ":" + Utils.hex(ipv6[7] & 0xff),
+                mac = Utils.hex((ipv6[4] >>> 8) ^ 2) + ":" + Utils.hex(ipv6[4] & 0xff) + ":" +
+                Utils.hex(ipv6[5] >>> 8) + ":" + Utils.hex(ipv6[6] & 0xff) + ":" +
+                Utils.hex(ipv6[7] >>> 8) + ":" + Utils.hex(ipv6[7] & 0xff);
+            output += "\nInterface identifier: " + intIdent +
+                "\nMAC address:          " + mac;
         }
         return output;
     }
diff --git a/src/core/operations/Sort.mjs b/src/core/operations/Sort.mjs
index a1148f7c..b5caf0ae 100644
--- a/src/core/operations/Sort.mjs
+++ b/src/core/operations/Sort.mjs
@@ -7,6 +7,7 @@
 import Operation from "../Operation.mjs";
 import Utils from "../Utils.mjs";
 import {INPUT_DELIM_OPTIONS} from "../lib/Delim.mjs";
+import {strToIpv6} from "../lib/IP.mjs";
 
 /**
  * Sort operation
@@ -38,7 +39,7 @@ class Sort extends Operation {
             {
                 "name": "Order",
                 "type": "option",
-                "value": ["Alphabetical (case sensitive)", "Alphabetical (case insensitive)", "IP address", "Numeric", "Numeric (hexadecimal)"]
+                "value": ["Alphabetical (case sensitive)", "Alphabetical (case insensitive)", "IPv4 address", "IPv6 address", "Numeric", "Numeric (hexadecimal)"]
             }
         ];
     }
@@ -58,8 +59,10 @@ class Sort extends Operation {
             sorted = sorted.sort();
         } else if (order === "Alphabetical (case insensitive)") {
             sorted = sorted.sort(Sort._caseInsensitiveSort);
-        } else if (order === "IP address") {
-            sorted = sorted.sort(Sort._ipSort);
+        } else if (order === "IPv4 address") {
+            sorted = sorted.sort(Sort._ipv4Sort);
+        } else if (order === "IPv6 address") {
+            sorted = sorted.sort(Sort._ipv6Sort);
         } else if (order === "Numeric") {
             sorted = sorted.sort(Sort._numericSort);
         } else if (order === "Numeric (hexadecimal)") {
@@ -91,7 +94,7 @@ class Sort extends Operation {
      * @param {string} b
      * @returns {number}
      */
-    static _ipSort(a, b) {
+    static _ipv4Sort(a, b) {
         let a_ = a.split("."),
             b_ = b.split(".");
 
@@ -105,6 +108,18 @@ class Sort extends Operation {
         return a_ - b_;
     }
 
+    /**
+     * Comparison operator for sorting of IPv6 addresses.
+     *
+     * @param {string} a
+     * @param {string} b
+     * @returns {number}
+     */
+    static _ipv6Sort(a, b) {
+        const numericalA = strToIpv6(a, false), numericalB = strToIpv6(b, false);
+        return numericalA - numericalB;
+    }
+
     /**
      * Comparison operation for sorting of numeric values.
      *