7.1.0

Merge branch 'feature-logging'
Added more comprehensive logging to FlowControl ops and added '>' prefix to all ChefWorker logs to improve clarity
2025-12-05 23:53:27 +00:00 · 2017-12-29 17:48:22 +00:00 · 2017-12-29 17:48:14 +00:00 · 2017-12-29 17:32:23 +00:00 · 2017-12-28 18:33:59 +00:00 · 2017-12-28 18:24:29 +00:00
69 changed files with 3637 additions and 882 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -35,7 +35,6 @@
        }],

        // disable rules from base configurations
-        "no-console": "off",
        "no-control-regex": "off",

        // stylistic conventions
@@ -90,6 +89,7 @@
        "$": false,
        "jQuery": false,
        "moment": false,
+        "log": false,

        "COMPILE_TIME": false,
        "COMPILE_MSG": false,
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -5,21 +5,10 @@
 <!-- Misc: -->

 ### Summary
-<!-- If you're describing a bug, tell us what's wrong -->
-<!-- If you're suggesting a change/improvement, tell us what it is and how it should work -->
+

 ### Example
 <!-- If describing a bug, tell us what happens instead of the expected behavior -->
 <!-- Include a link that triggers the bug if possible -->
 <!-- If you are requesting a new operation, include example input and output -->

-### Possible solutions
-<!-- Not obligatory, but suggest a fix/reason for the bug, or ideas for how to -->
-<!-- implement the addition or change, including links to relevant resources -->
-
-### Environment
-<!-- Include any relevant details about the environment you experienced the bug in -->
-<!-- This information is displayed in the About/Support pane -->
-* CyberChef compile time: 
-* User-Agent: 
-* [Link to reproduce]()
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,4 +39,10 @@ deploy:
    on:
      tags: true
      branch: master
-
+notifications:
+    webhooks:
+        urls:
+            - https://webhooks.gitter.im/e/83c143a6822e218d5b34
+        on_success: change
+        on_failure: always
+        on_start: never
--- a/README.md
+++ b/README.md
@@ -2,10 +2,11 @@

 [![Build Status](https://travis-ci.org/gchq/CyberChef.svg?branch=master)](https://travis-ci.org/gchq/CyberChef)
 [![dependencies Status](https://david-dm.org/gchq/CyberChef/status.svg)](https://david-dm.org/gchq/CyberChef)
-[![devDependencies Status](https://david-dm.org/gchq/CyberChef/dev-status.svg)](https://david-dm.org/gchq/CyberChef?type=dev)
-[![npm](http://img.shields.io/npm/v/cyberchef.svg)](https://www.npmjs.com/package/cyberchef)
+[![npm](https://img.shields.io/npm/v/cyberchef.svg)](https://www.npmjs.com/package/cyberchef)
 ![](https://reposs.herokuapp.com/?path=gchq/CyberChef&color=blue)
 [![](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/gchq/CyberChef/blob/master/LICENSE)
+[![Gitter](https://badges.gitter.im/gchq/CyberChef.svg)](https://gitter.im/gchq/CyberChef?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+

 #### *The Cyber Swiss Army Knife*

@@ -63,9 +64,9 @@ You can use as many operations as you like in simple or complex ways. Some examp
 - Highlighting
     - When you highlight text in the input or output, the offset and length values will be displayed and, if possible, the corresponding data will be highlighted in the output or input respectively (example: [highlight the word 'question' in the input to see where it appears in the output][10]).
 - Save to file and load from file
-     - You can save the output to a file at any time or load a file by dragging and dropping it into the input field (note that files larger than about 500kb may cause your browser to hang or even crash due to the way that browsers handle large amounts of textual data).
+     - You can save the output to a file at any time or load a file by dragging and dropping it into the input field. Files up to around 500MB are supported (depending on your browser), however some operations may take a very long time to run over this much data.
 - CyberChef is entirely client-side
-     - It should be noted that none of your input or recipe configuration is ever sent to the CyberChef web server - all processing is carried out within your browser, on your own computer.
+     - It should be noted that none of your recipe configuration or input (either text or files) is ever sent to the CyberChef web server - all processing is carried out within your browser, on your own computer.
     - Due to this feature, CyberChef can be compiled into a single HTML file. You can download this file and drop it into a virtual machine, share it with other people, or use it independently on your desktop.


@@ -99,6 +100,6 @@ CyberChef is released under the [Apache 2.0 Licence](https://www.apache.org/lice
  [5]: https://gchq.github.io/CyberChef/#recipe=From_Hexdump()Gunzip()&input=MDAwMDAwMDAgIDFmIDhiIDA4IDAwIDEyIGJjIGYzIDU3IDAwIGZmIDBkIGM3IGMxIDA5IDAwIDIwICB8Li4uLi6881cu/y7HwS4uIHwKMDAwMDAwMTAgIDA4IDA1IGQwIDU1IGZlIDA0IDJkIGQzIDA0IDFmIGNhIDhjIDQ0IDIxIDViIGZmICB8Li7QVf4uLdMuLsouRCFb/3wKMDAwMDAwMjAgIDYwIGM3IGQ3IDAzIDE2IGJlIDQwIDFmIDc4IDRhIDNmIDA5IDg5IDBiIDlhIDdkICB8YMfXLi6%2BQC54Sj8uLi4ufXwKMDAwMDAwMzAgIDRlIGM4IDRlIDZkIDA1IDFlIDAxIDhiIDRjIDI0IDAwIDAwIDAwICAgICAgICAgICB8TshObS4uLi5MJC4uLnw
  [6]: https://gchq.github.io/CyberChef/#recipe=RC4(%7B'option':'UTF8','string':'secret'%7D,'Hex','Hex')Disassemble_x86('64','Full%20x86%20architecture',16,0,true,true)&input=MjFkZGQyNTQwMTYwZWU2NWZlMDc3NzEwM2YyYTM5ZmJlNWJjYjZhYTBhYWJkNDE0ZjkwYzZjYWY1MzEyNzU0YWY3NzRiNzZiM2JiY2QxOTNjYjNkZGZkYmM1YTI2NTMzYTY4NmI1OWI4ZmVkNGQzODBkNDc0NDIwMWFlYzIwNDA1MDcxMzhlMmZlMmIzOTUwNDQ2ZGIzMWQyYmM2MjliZTRkM2YyZWIwMDQzYzI5M2Q3YTVkMjk2MmMwMGZlNmRhMzAwNzJkOGM1YTZiNGZlN2Q4NTlhMDQwZWVhZjI5OTczMzYzMDJmNWEwZWMxOQ
  [7]: https://gchq.github.io/CyberChef/#recipe=Fork('%5C%5Cn','%5C%5Cn',false)From_UNIX_Timestamp('Seconds%20(s)')&input=OTc4MzQ2ODAwCjEwMTI2NTEyMDAKMTA0NjY5NjQwMAoxMDgxMDg3MjAwCjExMTUzMDUyMDAKMTE0OTYwOTYwMA
-  [8]: https://gchq.github.io/CyberChef/#recipe=Fork('%5C%5Cn','%5C%5Cn',false)Conditional_Jump('1',2,10)To_Hex('Space')Return()To_Base64('A-Za-z0-9%2B/%3D')&input=U29tZSBkYXRhIHdpdGggYSAxIGluIGl0ClNvbWUgZGF0YSB3aXRoIGEgMiBpbiBpdA
+  [8]: https://gchq.github.ioeCyberChef/#recipe=Fork('%5C%5Cn','%5C%5Cn',false)Conditional_Jump('1',false,'base64',10)To_Hex('Space')Return()Label('base64')To_Base64('A-Za-z0-9%2B/%3D')&input=U29tZSBkYXRhIHdpdGggYSAxIGluIGl0ClNvbWUgZGF0YSB3aXRoIGEgMiBpbiBpdA
  [9]: https://gchq.github.io/CyberChef/#recipe=Register('key%3D(%5B%5C%5Cda-f%5D*)',true,false)Find_/_Replace(%7B'option':'Regex','string':'.*data%3D(.*)'%7D,'$1',true,false,true)RC4(%7B'option':'Hex','string':'$R0'%7D,'Hex','Latin1')&input=aHR0cDovL21hbHdhcmV6LmJpei9iZWFjb24ucGhwP2tleT0wZTkzMmE1YyZkYXRhPThkYjdkNWViZTM4NjYzYTU0ZWNiYjMzNGUzZGIxMQ
  [10]: https://gchq.github.io/CyberChef/#recipe=XOR(%7B'option':'Hex','string':'3a'%7D,'',false)To_Hexdump(16,false,false)&input=VGhlIGFuc3dlciB0byB0aGUgdWx0aW1hdGUgcXVlc3Rpb24gb2YgbGlmZSwgdGhlIFVuaXZlcnNlLCBhbmQgZXZlcnl0aGluZyBpcyA0Mi4
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cyberchef",
-  "version": "6.4.0",
+  "version": "7.1.0",
  "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
  "author": "n1474335 <n1474335@gmail.com>",
  "homepage": "https://gchq.github.io/CyberChef",
@@ -32,11 +32,11 @@
  "devDependencies": {
    "babel-core": "^6.26.0",
    "babel-loader": "^7.1.2",
-    "babel-preset-env": "^1.6.0",
+    "babel-preset-env": "^1.6.1",
    "css-loader": "^0.28.7",
    "exports-loader": "^0.6.4",
-    "extract-text-webpack-plugin": "^3.0.1",
-    "file-loader": "^1.1.4",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^1.1.6",
    "grunt": ">=1.0.1",
    "grunt-accessibility": "~5.0.0",
    "grunt-chmod": "~1.1.1",
@@ -50,21 +50,21 @@
    "grunt-webpack": "^3.0.2",
    "html-webpack-plugin": "^2.30.1",
    "imports-loader": "^0.7.1",
-    "ink-docstrap": "^1.3.0",
+    "ink-docstrap": "^1.3.2",
    "jsdoc-babel": "^0.3.0",
-    "less": "^2.7.2",
+    "less": "^2.7.3",
    "less-loader": "^4.0.5",
    "postcss-css-variables": "^0.8.0",
    "postcss-import": "^11.0.0",
-    "postcss-loader": "^2.0.6",
-    "style-loader": "^0.19.0",
-    "url-loader": "^0.5.9",
-    "val-loader": "^1.0.2",
+    "postcss-loader": "^2.0.9",
+    "style-loader": "^0.19.1",
+    "url-loader": "^0.6.2",
+    "val-loader": "^1.1.0",
    "web-resource-inliner": "^4.2.0",
-    "webpack": "^3.6.0",
-    "webpack-dev-server": "^2.9.1",
+    "webpack": "^3.10.0",
+    "webpack-dev-server": "^2.9.7",
    "webpack-node-externals": "^1.6.0",
-    "worker-loader": "^1.0.0"
+    "worker-loader": "^1.1.0"
  },
  "dependencies": {
    "babel-polyfill": "^6.26.0",
@@ -73,29 +73,34 @@
    "bootstrap-switch": "^3.3.4",
    "crypto-api": "^0.7.5",
    "crypto-js": "^3.1.9-1",
-    "diff": "^3.3.1",
+    "diff": "^3.4.0",
    "escodegen": "^1.9.0",
    "esmangle": "^1.0.1",
    "esprima": "^4.0.0",
    "exif-parser": "^0.1.12",
+    "file-saver": "^1.3.3",
    "google-code-prettify": "^1.0.5",
    "jquery": "^3.2.1",
    "js-crc": "^0.2.0",
-    "js-sha3": "^0.6.1",
+    "js-sha3": "^0.7.0",
    "jsbn": "^1.1.0",
-    "jsonpath": "^0.2.12",
+    "jsonpath": "^1.0.0",
    "jsrsasign": "8.0.4",
    "lodash": "^4.17.4",
-    "moment": "^2.18.1",
-    "moment-timezone": "^0.5.13",
+    "loglevel": "^1.6.0",
+    "loglevel-message-prefix": "^3.0.0",
+    "moment": "^2.20.1",
+    "moment-timezone": "^0.5.14",
    "node-md6": "^0.1.0",
+    "nwmatcher": "^1.4.3",
    "otp": "^0.1.3",
    "sladex-blowfish": "^0.8.1",
-    "sortablejs": "^1.6.1",
+    "sortablejs": "^1.7.0",
    "split.js": "^1.3.5",
+    "utf8": "^3.0.0",
    "vkbeautify": "^0.99.3",
    "xmldom": "^0.1.27",
-    "xpath": "0.0.24",
+    "xpath": "0.0.27",
    "zlibjs": "^0.3.1"
  },
  "scripts": {
--- a/src/core/Chef.js
+++ b/src/core/Chef.js
@@ -19,7 +19,7 @@ const Chef = function() {
 /**
 * Runs the recipe over the input.
 *
- * @param {string} inputText - The input data as a string
+ * @param {string|ArrayBuffer} input - The input data as a string or ArrayBuffer
 * @param {Object[]} recipeConfig - The recipe configuration object
 * @param {Object} options - The options object storing various user choices
 * @param {boolean} options.attempHighlight - Whether or not to attempt highlighting
@@ -33,7 +33,8 @@ const Chef = function() {
 * @returns {number} response.duration - The number of ms it took to execute the recipe
 * @returns {number} response.error - The error object thrown by a failed operation (false if no error)
 */
-Chef.prototype.bake = async function(inputText, recipeConfig, options, progress, step) {
+Chef.prototype.bake = async function(input, recipeConfig, options, progress, step) {
+    log.debug("Chef baking");
    let startTime  = new Date().getTime(),
        recipe     = new Recipe(recipeConfig),
        containsFc = recipe.containsFlowControl(),
@@ -62,22 +63,30 @@ Chef.prototype.bake = async function(inputText, recipeConfig, options, progress,

    // If starting from scratch, load data
    if (progress === 0) {
-        this.dish.set(inputText, Dish.STRING);
+        const type = input instanceof ArrayBuffer ? Dish.ARRAY_BUFFER : Dish.STRING;
+        this.dish.set(input, type);
    }

    try {
        progress = await recipe.execute(this.dish, progress);
    } catch (err) {
-        // Return the error in the result so that everything else gets correctly updated
-        // rather than throwing it here and losing state info.
-        error = err;
+        log.error(err);
+        error = {
+            displayStr: err.displayStr,
+        };
        progress = err.progress;
    }

+    // Depending on the size of the output, we may send it back as a string or an ArrayBuffer.
+    // This can prevent unnecessary casting as an ArrayBuffer can be easily downloaded as a file.
+    // The threshold is specified in KiB.
+    const threshold = (options.outputFileThreshold || 1024) * 1024;
+    const returnType = this.dish.size() > threshold ? Dish.ARRAY_BUFFER : Dish.STRING;
+
    return {
        result: this.dish.type === Dish.HTML ?
            this.dish.get(Dish.HTML) :
-            this.dish.get(Dish.STRING),
+            this.dish.get(returnType),
        type: Dish.enumLookup(this.dish.type),
        progress: progress,
        duration: new Date().getTime() - startTime,
@@ -104,6 +113,8 @@ Chef.prototype.bake = async function(inputText, recipeConfig, options, progress,
 * @returns {number} The time it took to run the silent bake in milliseconds.
 */
 Chef.prototype.silentBake = function(recipeConfig) {
+    log.debug("Running silent bake");
+
    let startTime = new Date().getTime(),
        recipe    = new Recipe(recipeConfig),
        dish      = new Dish("", Dish.STRING);
--- a/src/core/ChefWorker.js
+++ b/src/core/ChefWorker.js
@@ -11,6 +11,15 @@ import Chef from "./Chef.js";
 import OperationConfig from "./config/MetaConfig.js";
 import OpModules from "./config/modules/Default.js";

+// Add ">" to the start of all log messages in the Chef Worker
+import loglevelMessagePrefix from "loglevel-message-prefix";
+
+loglevelMessagePrefix(log, {
+    prefixes: [],
+    staticPrefixes: [">"],
+    prefixFormat: "%p"
+});
+

 // Set up Chef instance
 self.chef = new Chef();
@@ -42,6 +51,8 @@ self.postMessage({
 self.addEventListener("message", function(e) {
    // Handle message
    const r = e.data;
+    log.debug("ChefWorker receiving command '" + r.action + "'");
+
    switch (r.action) {
        case "bake":
            bake(r.data);
@@ -61,6 +72,9 @@ self.addEventListener("message", function(e) {
                r.data.pos
            );
            break;
+        case "setLogLevel":
+            log.setLevel(r.data, false);
+            break;
        default:
            break;
    }
@@ -86,7 +100,7 @@ async function bake(data) {
        );

        self.postMessage({
-            action: "bakeSuccess",
+            action: "bakeComplete",
            data: response
        });
    } catch (err) {
@@ -121,7 +135,7 @@ function loadRequiredModules(recipeConfig) {
        let module = self.OperationConfig[op.op].module;

        if (!OpModules.hasOwnProperty(module)) {
-            console.log("Loading module " + module);
+            log.info("Loading module " + module);
            self.sendStatusMessage("Loading module " + module);
            self.importScripts(self.docURL + "/" + module + ".js");
        }
--- a/src/core/Dish.js
+++ b/src/core/Dish.js
@@ -8,12 +8,12 @@ import Utils from "./Utils.js";
 * @license Apache-2.0
 *
 * @class
- * @param {byteArray|string|number} value - The value of the input data.
+ * @param {byteArray|string|number|ArrayBuffer} value - The value of the input data.
 * @param {number} type - The data type of value, see Dish enums.
 */
 const Dish = function(value, type) {
-    this.value = value || typeof value == "string" ? value : null;
-    this.type  = type || Dish.BYTE_ARRAY;
+    this.value = value || typeof value === "string" ? value : null;
+    this.type = type || Dish.BYTE_ARRAY;
 };


@@ -41,6 +41,12 @@ Dish.NUMBER = 2;
 * @enum
 */
 Dish.HTML = 3;
+/**
+ * Dish data type enum for ArrayBuffers.
+ * @readonly
+ * @enum
+ */
+Dish.ARRAY_BUFFER = 4;


 /**
@@ -64,6 +70,9 @@ Dish.typeEnum = function(typeStr) {
        case "html":
        case "HTML":
            return Dish.HTML;
+        case "arrayBuffer":
+        case "ArrayBuffer":
+            return Dish.ARRAY_BUFFER;
        default:
            throw "Invalid data type string. No matching enum.";
    }
@@ -87,6 +96,8 @@ Dish.enumLookup = function(typeEnum) {
            return "number";
        case Dish.HTML:
            return "html";
+        case Dish.ARRAY_BUFFER:
+            return "ArrayBuffer";
        default:
            throw "Invalid data type enum. No matching type.";
    }
@@ -96,12 +107,13 @@ Dish.enumLookup = function(typeEnum) {
 /**
 * Sets the data value and type and then validates them.
 *
- * @param {byteArray|string|number} value - The value of the input data.
+ * @param {byteArray|string|number|ArrayBuffer} value - The value of the input data.
 * @param {number} type - The data type of value, see Dish enums.
 */
 Dish.prototype.set = function(value, type) {
+    log.debug("Dish type: " + Dish.enumLookup(type));
    this.value = value;
-    this.type  = type;
+    this.type = type;

    if (!this.valid()) {
        const sample = Utils.truncate(JSON.stringify(this.value), 13);
@@ -114,7 +126,7 @@ Dish.prototype.set = function(value, type) {
 * Returns the value of the data in the type format specified.
 *
 * @param {number} type - The data type of value, see Dish enums.
- * @returns {byteArray|string|number} The value of the output data.
+ * @returns {byteArray|string|number|ArrayBuffer} The value of the output data.
 */
 Dish.prototype.get = function(type) {
    if (this.type !== type) {
@@ -130,24 +142,29 @@ Dish.prototype.get = function(type) {
 * @param {number} toType - The data type of value, see Dish enums.
 */
 Dish.prototype.translate = function(toType) {
+    log.debug(`Translating Dish from ${Dish.enumLookup(this.type)} to ${Dish.enumLookup(toType)}`);
+
    // Convert data to intermediate byteArray type
    switch (this.type) {
        case Dish.STRING:
            this.value = this.value ? Utils.strToByteArray(this.value) : [];
-            this.type = Dish.BYTE_ARRAY;
            break;
        case Dish.NUMBER:
            this.value = typeof this.value == "number" ? Utils.strToByteArray(this.value.toString()) : [];
-            this.type = Dish.BYTE_ARRAY;
            break;
        case Dish.HTML:
            this.value = this.value ? Utils.strToByteArray(Utils.unescapeHtml(Utils.stripHtmlTags(this.value, true))) : [];
-            this.type = Dish.BYTE_ARRAY;
+            break;
+        case Dish.ARRAY_BUFFER:
+            // Array.from() would be nicer here, but it's slightly slower
+            this.value = Array.prototype.slice.call(new Uint8Array(this.value));
            break;
        default:
            break;
    }

+    this.type = Dish.BYTE_ARRAY;
+
    // Convert from byteArray to toType
    switch (toType) {
        case Dish.STRING:
@@ -159,6 +176,10 @@ Dish.prototype.translate = function(toType) {
            this.value = this.value ? parseFloat(Utils.byteArrayToUtf8(this.value)) : 0;
            this.type = Dish.NUMBER;
            break;
+        case Dish.ARRAY_BUFFER:
+            this.value = new Uint8Array(this.value).buffer;
+            this.type = Dish.ARRAY_BUFFER;
+            break;
        default:
            break;
    }
@@ -180,7 +201,7 @@ Dish.prototype.valid = function() {

            // Check that every value is a number between 0 - 255
            for (let i = 0; i < this.value.length; i++) {
-                if (typeof this.value[i] != "number" ||
+                if (typeof this.value[i] !== "number" ||
                    this.value[i] < 0 ||
                    this.value[i] > 255) {
                    return false;
@@ -189,18 +210,38 @@ Dish.prototype.valid = function() {
            return true;
        case Dish.STRING:
        case Dish.HTML:
-            if (typeof this.value == "string") {
-                return true;
-            }
-            return false;
+            return typeof this.value === "string";
        case Dish.NUMBER:
-            if (typeof this.value == "number") {
-                return true;
-            }
-            return false;
+            return typeof this.value === "number";
+        case Dish.ARRAY_BUFFER:
+            return this.value instanceof ArrayBuffer;
        default:
            return false;
    }
 };

+
+/**
+ * Determines how much space the Dish takes up.
+ * Numbers in JavaScript are 64-bit floating point, however for the purposes of the Dish,
+ * we measure how many bytes are taken up when the number is written as a string.
+ *
+ * @returns {number}
+*/
+Dish.prototype.size = function() {
+    switch (this.type) {
+        case Dish.BYTE_ARRAY:
+        case Dish.STRING:
+        case Dish.HTML:
+            return this.value.length;
+        case Dish.NUMBER:
+            return this.value.toString().length;
+        case Dish.ARRAY_BUFFER:
+            return this.value.byteLength;
+        default:
+            return -1;
+    }
+};
+
+
 export default Dish;
--- a/src/core/FlowControl.js
+++ b/src/core/FlowControl.js
@@ -56,6 +56,7 @@ const FlowControl = {

        // Run recipe over each tranche
        for (i = 0; i < inputs.length; i++) {
+            log.debug(`Entering tranche ${i + 1} of ${inputs.length}`);
            const dish = new Dish(inputs[i], inputType);
            try {
                progress = await recipe.execute(dish, 0);
@@ -169,20 +170,19 @@ const FlowControl = {
     * @returns {Object} The updated state of the recipe.
     */
    runJump: function(state) {
-        let ings     = state.opList[state.progress].getIngValues(),
-            jumpNum  = ings[0],
-            maxJumps = ings[1];
+        const ings     = state.opList[state.progress].getIngValues(),
+            label = ings[0],
+            maxJumps = ings[1],
+            jmpIndex = FlowControl._getLabelIndex(label, state);

-        if (jumpNum < 0) {
-            jumpNum--;
-        }
-
-        if (state.numJumps >= maxJumps) {
+        if (state.numJumps >= maxJumps || jmpIndex === -1) {
+            log.debug("Maximum jumps reached or label cannot be found");
            return state;
        }

-        state.progress += jumpNum;
+        state.progress = jmpIndex;
        state.numJumps++;
+        log.debug(`Jumping to label '${label}' at position ${jmpIndex} (jumps = ${state.numJumps})`);
        return state;
    },

@@ -198,23 +198,26 @@ const FlowControl = {
     * @returns {Object} The updated state of the recipe.
     */
    runCondJump: function(state) {
-        let ings     = state.opList[state.progress].getIngValues(),
+        const ings     = state.opList[state.progress].getIngValues(),
            dish     = state.dish,
            regexStr = ings[0],
-            jumpNum  = ings[1],
-            maxJumps = ings[2];
+            invert   = ings[1],
+            label    = ings[2],
+            maxJumps = ings[3],
+            jmpIndex = FlowControl._getLabelIndex(label, state);

-        if (jumpNum < 0) {
-            jumpNum--;
-        }
-
-        if (state.numJumps >= maxJumps) {
+        if (state.numJumps >= maxJumps || jmpIndex === -1) {
+            log.debug("Maximum jumps reached or label cannot be found");
            return state;
        }

-        if (regexStr !== "" && dish.get(Dish.STRING).search(regexStr) > -1) {
-            state.progress += jumpNum;
-            state.numJumps++;
+        if (regexStr !== "") {
+            let strMatch = dish.get(Dish.STRING).search(regexStr) > -1;
+            if (!invert && strMatch || invert && !strMatch) {
+                state.progress = jmpIndex;
+                state.numJumps++;
+                log.debug(`Jumping to label '${label}' at position ${jmpIndex} (jumps = ${state.numJumps})`);
+            }
        }

        return state;
@@ -249,6 +252,27 @@ const FlowControl = {
        return state;
    },

+
+    /**
+     * Returns the index of a label.
+     *
+     * @private
+     * @param {Object} state
+     * @param {string} name
+     * @returns {number}
+     */
+    _getLabelIndex: function(name, state) {
+        for (let o = 0; o < state.opList.length; o++) {
+            let operation = state.opList[o];
+            if (operation.name === "Label"){
+                let ings = operation.getIngValues();
+                if (name === ings[0]) {
+                    return o;
+                }
+            }
+        }
+        return -1;
+    },
 };

 export default FlowControl;
--- a/src/core/Recipe.js
+++ b/src/core/Recipe.js
@@ -146,18 +146,23 @@ Recipe.prototype.lastOpIndex = function(startIndex) {
 Recipe.prototype.execute = async function(dish, startFrom) {
    startFrom = startFrom || 0;
    let op, input, output, numJumps = 0, numRegisters = 0;
+    log.debug(`[*] Executing recipe of ${this.opList.length} operations, starting at ${startFrom}`);

    for (let i = startFrom; i < this.opList.length; i++) {
        op = this.opList[i];
+        log.debug(`[${i}] ${op.name} ${JSON.stringify(op.getIngValues())}`);
        if (op.isDisabled()) {
+            log.debug("Operation is disabled, skipping");
            continue;
        }
        if (op.isBreakpoint()) {
+            log.debug("Pausing at breakpoint");
            return i;
        }

        try {
            input = dish.get(op.inputType);
+            log.debug("Executing operation");

            if (op.isFlowControl()) {
                // Package up the current state
@@ -193,6 +198,7 @@ Recipe.prototype.execute = async function(dish, startFrom) {
        }
    }

+    log.debug("Recipe complete");
    return this.opList.length;
 };

--- a/src/core/Utils.js
+++ b/src/core/Utils.js
@@ -1,4 +1,4 @@
-import CryptoJS from "crypto-js";
+import utf8 from "utf8";


 /**
@@ -64,58 +64,6 @@ const Utils = {
    },


-    /**
-     * Adds leading zeros to strings
-     *
-     * @param {string} str - String to add leading characters to.
-     * @param {number} max - Maximum width of the string.
-     * @param {char} [chr='0'] - The character to pad with.
-     * @returns {string}
-     *
-     * @example
-     * // returns "0a"
-     * Utils.padLeft("a", 2);
-     *
-     * // returns "000a"
-     * Utils.padLeft("a", 4);
-     *
-     * // returns "xxxa"
-     * Utils.padLeft("a", 4, "x");
-     *
-     * // returns "bcabchello"
-     * Utils.padLeft("hello", 10, "abc");
-     */
-    padLeft: function(str, max, chr) {
-        chr = chr || "0";
-        let startIndex = chr.length - (max - str.length);
-        startIndex = startIndex < 0 ? 0 : startIndex;
-        return str.length < max ?
-            Utils.padLeft(chr.slice(startIndex, chr.length) + str, max, chr) : str;
-    },
-
-
-    /**
-     * Adds trailing spaces to strings.
-     *
-     * @param {string} str - String to add trailing characters to.
-     * @param {number} max - Maximum width of the string.
-     * @param {char} [chr='0'] - The character to pad with.
-     * @returns {string}
-     *
-     * @example
-     * // returns "a   "
-     * Utils.padRight("a", 4);
-     *
-     * // returns "axxx"
-     * Utils.padRight("a", 4, "x");
-     */
-    padRight: function(str, max, chr) {
-        chr = chr || " ";
-        return str.length < max ?
-            Utils.padRight(str + chr.slice(0, max-str.length), max, chr) : str;
-    },
-
-
    /**
     * Adds trailing bytes to a byteArray.
     *
@@ -152,14 +100,6 @@ const Utils = {
    },


-    /**
-     * @alias Utils.padLeft
-     */
-    pad: function(str, max, chr) {
-        return Utils.padLeft(str, max, chr);
-    },
-
-
    /**
     * Truncates a long string to max length and adds suffix.
     *
@@ -201,7 +141,7 @@ const Utils = {
    hex: function(c, length) {
        c = typeof c == "string" ? Utils.ord(c) : c;
        length = length || 2;
-        return Utils.pad(c.toString(16), length);
+        return c.toString(16).padStart(length, "0");
    },


@@ -222,7 +162,7 @@ const Utils = {
    bin: function(c, length) {
        c = typeof c == "string" ? Utils.ord(c) : c;
        length = length || 8;
-        return Utils.pad(c.toString(2), length);
+        return c.toString(2).padStart(length, "0");
    },


@@ -340,6 +280,39 @@ const Utils = {
    },


+    /**
+     * Coverts data of varying types to a byteArray.
+     * Accepts hex, Base64, UTF8 and Latin1 strings.
+     * 
+     * @param {string} str
+     * @param {string} type - One of "Hex", "Base64", "UTF8" or "Latin1"
+     * @returns {byteArray}
+     * 
+     * @example
+     * // returns [208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130]
+     * Utils.convertToByteArray("Привет", "utf8");
+     * 
+     * // returns [208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130]
+     * Utils.convertToByteArray("d097d0b4d180d0b0d0b2d181d182d0b2d183d0b9d182d0b5", "hex");
+     * 
+     * // returns [208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130]
+     * Utils.convertToByteArray("0JfQtNGA0LDQstGB0YLQstGD0LnRgtC1", "base64");
+     */
+    convertToByteArray: function(str, type) {
+        switch (type.toLowerCase()) {
+            case "hex":
+                return Utils.fromHex(str);
+            case "base64":
+                return Utils.fromBase64(str, null, "byteArray");
+            case "utf8":
+                return Utils.strToUtf8ByteArray(str);
+            case "latin1":
+            default:
+                return Utils.strToByteArray(str);
+        }
+    },
+
+
    /**
     * Converts a string to a byte array.
     * Treats the string as UTF-8 if any values are over 255.
@@ -381,17 +354,17 @@ const Utils = {
     * Utils.strToUtf8ByteArray("你好");
     */
    strToUtf8ByteArray: function(str) {
-        let wordArray = CryptoJS.enc.Utf8.parse(str),
-            byteArray = Utils.wordArrayToByteArray(wordArray);
+        const utf8Str = utf8.encode(str);

-        if (str.length !== wordArray.sigBytes) {
+        if (str.length !== utf8Str.length) {
            if (ENVIRONMENT_IS_WORKER()) {
                self.setOption("attemptHighlight", false);
            } else if (ENVIRONMENT_IS_WEB()) {
                window.app.options.attemptHighlight = false;
            }
        }
-        return byteArray;
+
+        return Utils.strToByteArray(utf8Str);
    },


@@ -443,26 +416,21 @@ const Utils = {
     * Utils.byteArrayToUtf8([228,189,160,229,165,189]);
     */
    byteArrayToUtf8: function(byteArray) {
+        const str = Utils.byteArrayToChars(byteArray);
        try {
-            // Try to output data as UTF-8 string
-            const words = [];
-            for (let i = 0; i < byteArray.length; i++) {
-                words[i >>> 2] |= byteArray[i] << (24 - (i % 4) * 8);
-            }
-            let wordArray = new CryptoJS.lib.WordArray.init(words, byteArray.length),
-                str = CryptoJS.enc.Utf8.stringify(wordArray);
+            const utf8Str = utf8.decode(str);

-            if (str.length !== wordArray.sigBytes) {
+            if (str.length !== utf8Str.length) {
                if (ENVIRONMENT_IS_WORKER()) {
                    self.setOption("attemptHighlight", false);
                } else if (ENVIRONMENT_IS_WEB()) {
                    window.app.options.attemptHighlight = false;
                }
            }
-            return str;
+            return utf8Str;
        } catch (err) {
            // If it fails, treat it as ANSI
-            return Utils.byteArrayToChars(byteArray);
+            return str;
        }
    },

@@ -470,7 +438,7 @@ const Utils = {
    /**
     * Converts a charcode array to a string.
     *
-     * @param {byteArray} byteArray
+     * @param {byteArray|Uint8Array} byteArray
     * @returns {string}
     *
     * @example
@@ -491,33 +459,25 @@ const Utils = {


    /**
-     * Converts a CryptoJS.lib.WordArray to a byteArray.
-     *
-     * @param {CryptoJS.lib.WordArray} wordArray
-     * @returns {byteArray}
-     *
+     * Converts an ArrayBuffer to a string.
+     * 
+     * @param {ArrayBuffer} arrayBuffer
+     * @returns {string}
+     * 
     * @example
-     * // returns [84, 101, 115, 116]
-     * Utils.wordArrayToByteArray(CryptoJS.enc.Hex.parse("54657374"));
+     * // returns "hello"
+     * Utils.arrayBufferToStr(Uint8Array.from([104,101,108,108,111]).buffer);
     */
-    wordArrayToByteArray: function(wordArray) {
-        if (wordArray.sigBytes <= 0) return [];
-
-        let words = wordArray.words,
-            byteArray = [];
-
-        for (let i = 0; i < wordArray.sigBytes; i++) {
-            byteArray.push((words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff);
-        }
-
-        return byteArray;
+    arrayBufferToStr: function(arrayBuffer) {
+        const byteArray = Array.prototype.slice.call(new Uint8Array(arrayBuffer));
+        return Utils.byteArrayToUtf8(byteArray);
    },


    /**
     * Base64's the input byte array using the given alphabet, returning a string.
     *
-     * @param {byteArray|string} data
+     * @param {byteArray|Uint8Array|string} data
     * @param {string} [alphabet]
     * @returns {string}
     *
@@ -636,7 +596,7 @@ const Utils = {
    /**
     * Convert a byte array into a hex string.
     *
-     * @param {byteArray} data
+     * @param {Uint8Array|byteArray} data
     * @param {string} [delim=" "]
     * @param {number} [padding=2]
     * @returns {string}
@@ -656,7 +616,7 @@ const Utils = {
        let output = "";

        for (let i = 0; i < data.length; i++) {
-            output += Utils.pad(data[i].toString(16), padding) + delim;
+            output += data[i].toString(16).padStart(padding, "0") + delim;
        }

        // Add \x or 0x to beginning
@@ -859,7 +819,7 @@ const Utils = {
     *
     * fragment      = *( pchar / "/" / "?" )
     * query         = *( pchar / "/" / "?" )
-     * pchar         = unreserved / pct-encoded / sub-delims / ":" / "@" 
+     * pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
     * unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
     * pct-encoded   = "%" HEXDIG HEXDIG
     * sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
@@ -1248,21 +1208,6 @@ const Utils = {
        "None":          /\s+/g // Included here to remove whitespace when there shouldn't be any
    },

-
-    /**
-     * A mapping of string formats to their classes in the CryptoJS library.
-     * @constant
-     */
-    format: {
-        "Hex":     CryptoJS.enc.Hex,
-        "Base64":  CryptoJS.enc.Base64,
-        "UTF8":    CryptoJS.enc.Utf8,
-        "UTF16":   CryptoJS.enc.Utf16,
-        "UTF16LE": CryptoJS.enc.Utf16LE,
-        "UTF16BE": CryptoJS.enc.Utf16BE,
-        "Latin1":  CryptoJS.enc.Latin1,
-    },
-
 };

 export default Utils;
@@ -1376,29 +1321,43 @@ String.prototype.count = function(chr) {
 };


-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Library overrides ///////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Override for the CryptoJS Hex encoding parser to remove whitespace before attempting to parse
- * the hex string.
- *
- * @param {string} hexStr
- * @returns {CryptoJS.lib.WordArray}
+/*
+ * Polyfills
 */
-CryptoJS.enc.Hex.parse = function (hexStr) {
-    // Remove whitespace
-    hexStr = hexStr.replace(/\s/g, "");

-    // Shortcut
-    const hexStrLength = hexStr.length;
+// https://github.com/uxitten/polyfill/blob/master/string.polyfill.js
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padStart
+if (!String.prototype.padStart) {
+    String.prototype.padStart = function padStart(targetLength, padString) {
+        targetLength = targetLength>>0; //floor if number or convert non-number to 0;
+        padString = String((typeof padString !== "undefined" ? padString : " "));
+        if (this.length > targetLength) {
+            return String(this);
+        } else {
+            targetLength = targetLength-this.length;
+            if (targetLength > padString.length) {
+                padString += padString.repeat(targetLength/padString.length); //append to original to ensure we are longer than needed
+            }
+            return padString.slice(0, targetLength) + String(this);
+        }
+    };
+}

-    // Convert
-    const words = [];
-    for (let i = 0; i < hexStrLength; i += 2) {
-        words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
-    }

-    return new CryptoJS.lib.WordArray.init(words, hexStrLength / 2);
-};
+// https://github.com/uxitten/polyfill/blob/master/string.polyfill.js
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padEnd
+if (!String.prototype.padEnd) {
+    String.prototype.padEnd = function padEnd(targetLength, padString) {
+        targetLength = targetLength>>0; //floor if number or convert non-number to 0;
+        padString = String((typeof padString !== "undefined" ? padString : " "));
+        if (this.length > targetLength) {
+            return String(this);
+        } else {
+            targetLength = targetLength-this.length;
+            if (targetLength > padString.length) {
+                padString += padString.repeat(targetLength/padString.length); //append to original to ensure we are longer than needed
+            }
+            return String(this) + padString.slice(0, targetLength);
+        }
+    };
+}
--- a/src/core/config/Categories.js
+++ b/src/core/config/Categories.js
@@ -113,7 +113,7 @@ const Categories = [
        ]
    },
    {
-        name: "Logical operations",
+        name: "Arithmetic / Logic",
        ops: [
            "XOR",
            "XOR Brute Force",
@@ -122,6 +122,13 @@ const Categories = [
            "AND",
            "ADD",
            "SUB",
+            "Sum",
+            "Subtract",
+            "Multiply",
+            "Divide",
+            "Mean",
+            "Median",
+            "Standard Deviation",
            "Bit shift left",
            "Bit shift right",
            "Rotate left",
@@ -288,6 +295,7 @@ const Categories = [
            "XPath expression",
            "JPath expression",
            "CSS selector",
+            "PHP Deserialize",
            "Microsoft Script Decoder",
            "Strip HTML tags",
            "Diff",
@@ -301,6 +309,7 @@ const Categories = [
        ops: [
            "Entropy",
            "Frequency distribution",
+            "Chi Square",
            "Detect File Type",
            "Scan for Embedded Files",
            "Disassemble x86",
@@ -319,6 +328,7 @@ const Categories = [
            "Fork",
            "Merge",
            "Register",
+            "Label",
            "Jump",
            "Conditional Jump",
            "Return",
--- a/src/core/config/OperationConfig.js
+++ b/src/core/config/OperationConfig.js
@@ -1,3 +1,4 @@
+import Arithmetic from "../operations/Arithmetic.js";
 import Base from "../operations/Base.js";
 import Base58 from "../operations/Base58.js";
 import Base64 from "../operations/Base64.js";
@@ -26,6 +27,7 @@ import JS from "../operations/JS.js";
 import MAC from "../operations/MAC.js";
 import MorseCode from "../operations/MorseCode.js";
 import NetBIOS from "../operations/NetBIOS.js";
+import PHP from "../operations/PHP.js";
 import PublicKey from "../operations/PublicKey.js";
 import Punycode from "../operations/Punycode.js";
 import Rotate from "../operations/Rotate.js";
@@ -136,15 +138,15 @@ const OperationConfig = {
    },
    "Jump": {
        module: "Default",
-        description: "Jump forwards or backwards over the specified number of operations.",
+        description: "Jump forwards or backwards to the specified Label",
        inputType: "string",
        outputType: "string",
        flowControl: true,
        args: [
            {
-                name: "Number of operations to jump over",
-                type: "number",
-                value: 0
+                name: "Label name",
+                type: "string",
+                value: ""
            },
            {
                name: "Maximum jumps (if jumping backwards)",
@@ -155,7 +157,7 @@ const OperationConfig = {
    },
    "Conditional Jump": {
        module: "Default",
-        description: "Conditionally jump forwards or backwards over the specified number of operations based on whether the data matches the specified regular expression.",
+        description: "Conditionally jump forwards or backwards to the specified Label  based on whether the data matches the specified regular expression.",
        inputType: "string",
        outputType: "string",
        flowControl: true,
@@ -166,9 +168,14 @@ const OperationConfig = {
                value: ""
            },
            {
-                name: "Number of operations to jump over if match found",
-                type: "number",
-                value: 0
+                name: "Invert match",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "Label name",
+                type: "shortString",
+                value: ""
            },
            {
                name: "Maximum jumps (if jumping backwards)",
@@ -177,6 +184,20 @@ const OperationConfig = {
            }
        ]
    },
+    "Label": {
+        module: "Default",
+        description: "Provides a location for conditional and fixed jumps to redirect execution to.",
+        inputType: "string",
+        outputType: "string",
+        flowControl: true,
+        args: [
+            {
+                name: "Name",
+                type: "shortString",
+                value: ""
+            }
+        ]
+    },
    "Return": {
        module: "Default",
        description: "End execution of operations at this point in the recipe.",
@@ -224,7 +245,7 @@ const OperationConfig = {
        description: "Base64 is a notation for encoding arbitrary byte data using a restricted set of symbols that can be conveniently used by humans and processed by computers.<br><br>This operation encodes data in an ASCII Base64 string.<br><br>e.g. <code>hello</code> becomes <code>aGVsbG8=</code>",
        highlight: "func",
        highlightReverse: "func",
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "string",
        args: [
            {
@@ -499,6 +520,97 @@ const OperationConfig = {
            }
        ]
    },
+    "Sum": {
+        module: "Default",
+        description: "Adds together a list of numbers. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 .5</code> becomes <code>18.5</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
+    "Subtract": {
+        module: "Default",
+        description: "Subtracts a list of numbers. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 .5</code> becomes <code>1.5</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
+    "Multiply": {
+        module: "Default",
+        description: "Multiplies a list of numbers. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 .5</code> becomes <code>40</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
+    "Divide": {
+        module: "Default",
+        description: "Divides a list of numbers. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 .5</code> becomes <code>2.5</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
+    "Mean": {
+        module: "Default",
+        description: "Computes the mean (average) of a number list. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 .5 .5</code> becomes <code>4.75</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
+    "Median": {
+        module: "Default",
+        description: "Computes the median of a number list. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 1 .5</code> becomes <code>4.5</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
+    "Standard Deviation": {
+        module: "Default",
+        description: "Computes the standard deviation of a number list. If an item in the string is not a number it is excluded from the list.<br><br>e.g. <code>0x0a 8 .5</code> becomes <code>4.089281382128433</code>",
+        inputType: "string",
+        outputType: "number",
+        args: [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: Arithmetic.DELIM_OPTIONS
+            }
+        ]
+    },
    "From Hex": {
        module: "Default",
        description: "Converts a hexadecimal byte string back into its raw value.<br><br>e.g. <code>ce 93 ce b5 ce b9 ce ac 20 cf 83 ce bf cf 85 0a</code> becomes the UTF-8 encoded string <code>Γειά σου</code>",
@@ -519,7 +631,7 @@ const OperationConfig = {
        description: "Converts the input string to hexadecimal bytes separated by the specified delimiter.<br><br>e.g. The UTF-8 encoded string <code>Γειά σου</code> becomes <code>ce 93 ce b5 ce b9 ce ac 20 cf 83 ce bf cf 85 0a</code>",
        highlight: "func",
        highlightReverse: "func",
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "string",
        args: [
            {
@@ -670,7 +782,7 @@ const OperationConfig = {
        description: "Creates a hexdump of the input data, displaying both the hexadecimal values of each byte and an ASCII representation alongside.",
        highlight: "func",
        highlightReverse: "func",
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "string",
        args: [
            {
@@ -760,14 +872,14 @@ const OperationConfig = {
        ]
    },
    "URL Decode": {
-        module: "Default",
+        module: "URL",
        description: "Converts URI/URL percent-encoded characters back to their raw values.<br><br>e.g. <code>%3d</code> becomes <code>=</code>",
        inputType: "string",
        outputType: "string",
        args: []
    },
    "URL Encode": {
-        module: "Default",
+        module: "URL",
        description: "Encodes problematic characters into percent-encoding, a format supported by URIs/URLs.<br><br>e.g. <code>=</code> becomes <code>%3d</code>",
        inputType: "string",
        outputType: "string",
@@ -780,7 +892,7 @@ const OperationConfig = {
        ]
    },
    "Parse URI": {
-        module: "Default",
+        module: "URL",
        description: "Pretty prints complicated Uniform Resource Identifier (URI) strings for ease of reading. Particularly useful for Uniform Resource Locators (URLs) with a lot of arguments.",
        inputType: "string",
        outputType: "string",
@@ -3175,7 +3287,7 @@ const OperationConfig = {
    "Frequency distribution": {
        module: "Default",
        description: "Displays the distribution of bytes in the data as a graph.",
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "html",
        args: [
            {
@@ -3185,6 +3297,13 @@ const OperationConfig = {
            }
        ]
    },
+    "Chi Square": {
+        module: "Default",
+        description: "Calculates the Chi Square distribution of values.",
+        inputType: "ArrayBuffer",
+        outputType: "number",
+        args: []
+    },
    "Numberwang": {
        module: "Default",
        description: "Based on the popular gameshow by Mitchell and Webb.",
@@ -3260,14 +3379,14 @@ const OperationConfig = {
    "Detect File Type": {
        module: "Default",
        description: "Attempts to guess the MIME (Multipurpose Internet Mail Extensions) type of the data based on 'magic bytes'.<br><br>Currently supports the following file types: 7z, amr, avi, bmp, bz2, class, cr2, crx, dex, dmg, doc, elf, eot, epub, exe, flac, flv, gif, gz, ico, iso, jpg, jxr, m4a, m4v, mid, mkv, mov, mp3, mp4, mpg, ogg, otf, pdf, png, ppt, ps, psd, rar, rtf, sqlite, swf, tar, tar.z, tif, ttf, utf8, vmdk, wav, webm, webp, wmv, woff, woff2, xls, xz, zip.",
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "string",
        args: []
    },
    "Scan for Embedded Files": {
        module: "Default",
        description: "Scans the data for potential embedded files by looking for magic bytes at all offsets. This operation is prone to false positives.<br><br>WARNING: Files over about 100KB in size will take a VERY long time to process.",
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "string",
        args: [
            {
@@ -3621,7 +3740,7 @@ const OperationConfig = {
            "<br><br>",
            "EXIF data from photos usually contains information about the image file itself as well as the device used to create it.",
        ].join("\n"),
-        inputType: "byteArray",
+        inputType: "ArrayBuffer",
        outputType: "string",
        args: [],
    },
@@ -3820,7 +3939,7 @@ const OperationConfig = {
    "Generate HOTP": {
        module: "Default",
        description: "The HMAC-based One-Time Password algorithm (HOTP) is an algorithm that computes a one-time password from a shared secret key and an incrementing counter. It has been adopted as Internet Engineering Task Force standard RFC 4226, is the cornerstone of Initiative For Open Authentication (OATH), and is used in a number of two-factor authentication systems.<br><br>Enter the secret as the input or leave it blank for a random secret to be generated.",
-        inputType: "string",
+        inputType: "byteArray",
        outputType: "string",
        args: [
            {
@@ -3845,6 +3964,19 @@ const OperationConfig = {
            }
        ]
    },
+    "PHP Deserialize": {
+        module: "Default",
+        description: "Deserializes PHP serialized data, outputting keyed arrays as JSON.<br><br>This function does not support <code>object</code> tags.<br><br>Example:<br><code>a:2:{s:1:&quot;a&quot;;i:10;i:0;a:1:{s:2:&quot;ab&quot;;b:1;}}</code><br>becomes<br><code>{&quot;a&quot;: 10,0: {&quot;ab&quot;: true}}</code><br><br><u>Output valid JSON:</u> JSON doesn't support integers as keys, whereas PHP serialization does. Enabling this will cast these integers to strings. This will also escape backslashes.",
+        inputType: "string",
+        outputType: "string",
+        args: [
+            {
+                name: "Output valid JSON",
+                type: "boolean",
+                value: PHP.OUTPUT_VALID_JSON
+            }
+        ]
+    },
 };


--- a/src/core/config/modules/Default.js
+++ b/src/core/config/modules/Default.js
@@ -1,4 +1,5 @@
 import FlowControl from "../../FlowControl.js";
+import Arithmetic from "../../operations/Arithmetic.js";
 import Base from "../../operations/Base.js";
 import Base58 from "../../operations/Base58.js";
 import Base64 from "../../operations/Base64.js";
@@ -20,16 +21,15 @@ import NetBIOS from "../../operations/NetBIOS.js";
 import Numberwang from "../../operations/Numberwang.js";
 import OS from "../../operations/OS.js";
 import OTP from "../../operations/OTP.js";
+import PHP from "../../operations/PHP.js";
 import QuotedPrintable from "../../operations/QuotedPrintable.js";
 import Rotate from "../../operations/Rotate.js";
 import SeqUtils from "../../operations/SeqUtils.js";
 import StrUtils from "../../operations/StrUtils.js";
 import Tidy from "../../operations/Tidy.js";
 import Unicode from "../../operations/Unicode.js";
-import URL_ from "../../operations/URL.js";
 import UUID from "../../operations/UUID.js";

-
 /**
 * Default module.
 *
@@ -38,8 +38,8 @@ import UUID from "../../operations/UUID.js";
 *
 * Libraries:
 *  - Utils.js
- *    - CryptoJS
 *  - otp
+ *  - crypto
 *
 * @author n1474335 [n1474335@gmail.com]
 * @copyright Crown Copyright 2017
@@ -77,9 +77,6 @@ OpModules.Default = {
    "From HTML Entity":     HTML.runFromEntity,
    "Strip HTML tags":      HTML.runStripTags,
    "Parse colour code":    HTML.runParseColourCode,
-    "URL Encode":           URL_.runTo,
-    "URL Decode":           URL_.runFrom,
-    "Parse URI":            URL_.runParse,
    "Unescape Unicode Characters": Unicode.runUnescape,
    "To Quoted Printable":  QuotedPrintable.runTo,
    "From Quoted Printable": QuotedPrintable.runFrom,
@@ -146,6 +143,7 @@ OpModules.Default = {
    "Microsoft Script Decoder": MS.runDecodeScript,
    "Entropy":              Entropy.runEntropy,
    "Frequency distribution": Entropy.runFreqDistrib,
+    "Chi Square":           Entropy.runChiSq,
    "Detect File Type":     FileType.runDetect,
    "Scan for Embedded Files": FileType.runScanForEmbeddedFiles,
    "Generate UUID":        UUID.runGenerateV4,
@@ -155,10 +153,19 @@ OpModules.Default = {
    "Fork":                 FlowControl.runFork,
    "Merge":                FlowControl.runMerge,
    "Register":             FlowControl.runRegister,
+    "Label":                FlowControl.runComment,
    "Jump":                 FlowControl.runJump,
    "Conditional Jump":     FlowControl.runCondJump,
    "Return":               FlowControl.runReturn,
    "Comment":              FlowControl.runComment,
+    "PHP Deserialize":      PHP.runDeserialize,
+    "Sum":                  Arithmetic.runSum,
+    "Subtract":             Arithmetic.runSub,
+    "Multiply":             Arithmetic.runMulti,
+    "Divide":               Arithmetic.runDiv,
+    "Mean":                 Arithmetic.runMean,
+    "Median":               Arithmetic.runMedian,
+    "Standard Deviation":   Arithmetic.runStdDev,


    /*
--- a/src/core/config/modules/OpModules.js
+++ b/src/core/config/modules/OpModules.js
@@ -19,6 +19,7 @@ import ImageModule from "./Image.js";
 import JSBNModule from "./JSBN.js";
 import PublicKeyModule from "./PublicKey.js";
 import ShellcodeModule from "./Shellcode.js";
+import URLModule from "./URL.js";

 Object.assign(
    OpModules,
@@ -33,7 +34,8 @@ Object.assign(
    ImageModule,
    JSBNModule,
    PublicKeyModule,
-    ShellcodeModule
+    ShellcodeModule,
+    URLModule
 );

 export default OpModules;
--- a/src/core/config/modules/URL.js
+++ b/src/core/config/modules/URL.js
@@ -0,0 +1,23 @@
+import URL_ from "../../operations/URL.js";
+
+
+/**
+ * URL module.
+ *
+ * Libraries:
+ *  - Utils.js
+ *  - url
+ *
+ * @author n1474335 [n1474335@gmail.com]
+ * @copyright Crown Copyright 2017
+ * @license Apache-2.0
+ */
+let OpModules = typeof self === "undefined" ? {} : self.OpModules || {};
+
+OpModules.URL = {
+    "URL Encode": URL_.runTo,
+    "URL Decode": URL_.runFrom,
+    "Parse URI":  URL_.runParse,
+};
+
+export default OpModules;
--- a/src/core/operations/Arithmetic.js
+++ b/src/core/operations/Arithmetic.js
@@ -0,0 +1,252 @@
+import Utils from "../Utils.js";
+
+
+/**
+ * Math operations on numbers.
+ *
+ * @author bwhitn [brian.m.whitney@outlook.com]
+ * @copyright Crown Copyright 2016
+ * @license Apache-2.0
+ *
+ * @namespace
+ */
+const Arithmetic = {
+
+    /**
+     * @constant
+     * @default
+     */
+    DELIM_OPTIONS: ["Line feed", "Space", "Comma", "Semi-colon", "Colon", "CRLF"],
+
+
+    /**
+     * Splits a string based on a delimiter and calculates the sum of numbers.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runSum: function(input, args) {
+        const val = Arithmetic._sum(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * Splits a string based on a delimiter and subtracts all the numbers.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runSub: function(input, args) {
+        let val = Arithmetic._sub(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * Splits a string based on a delimiter and multiplies the numbers.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runMulti: function(input, args) {
+        let val = Arithmetic._multi(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * Splits a string based on a delimiter and divides the numbers.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runDiv: function(input, args) {
+        let val = Arithmetic._div(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * Splits a string based on a delimiter and computes the mean (average).
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runMean: function(input, args) {
+        let val = Arithmetic._mean(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * Splits a string based on a delimiter and finds the median.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runMedian: function(input, args) {
+        let val = Arithmetic._median(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * splits a string based on a delimiter and computes the standard deviation.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runStdDev: function(input, args) {
+        let val = Arithmetic._stdDev(Arithmetic._createNumArray(input, args[0]));
+        return typeof(val) === "number" ? val : NaN;
+    },
+
+
+    /**
+     * Converts a string array to a number array.
+     *
+     * @private
+     * @param {string[]} input
+     * @param {string} delim
+     * @returns {number[]}
+     */
+    _createNumArray: function(input, delim) {
+        delim = Utils.charRep[delim || "Space"];
+        let splitNumbers = input.split(delim),
+            numbers = [],
+            num;
+
+        for (let i = 0; i < splitNumbers.length; i++) {
+            if (splitNumbers[i].indexOf(".") >= 0) {
+                num = parseFloat(splitNumbers[i].trim());
+            } else {
+                num = parseInt(splitNumbers[i].trim(), 0);
+            }
+            if (!isNaN(num)) {
+                numbers.push(num);
+            }
+        }
+        return numbers;
+    },
+
+
+    /**
+     * Adds an array of numbers and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _sum: function(data) {
+        if (data.length > 0) {
+            return data.reduce((acc, curr) => acc + curr);
+        }
+    },
+
+
+    /**
+     * Subtracts an array of numbers and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _sub: function(data) {
+        if (data.length > 0) {
+            return data.reduce((acc, curr) => acc - curr);
+        }
+    },
+
+
+    /**
+     * Multiplies an array of numbers and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _multi: function(data) {
+        if (data.length > 0) {
+            return data.reduce((acc, curr) => acc * curr);
+        }
+    },
+
+
+    /**
+     * Divides an array of numbers and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _div: function(data) {
+        if (data.length > 0) {
+            return data.reduce((acc, curr) => acc / curr);
+        }
+    },
+
+
+    /**
+     * Computes mean of a number array and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _mean: function(data) {
+        if (data.length > 0) {
+            return Arithmetic._sum(data) / data.length;
+        }
+    },
+
+
+    /**
+     * Computes median of a number array and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _median: function (data) {
+        if ((data.length % 2) === 0) {
+            let first, second;
+            data.sort(function(a, b){
+                return a - b;
+            });
+            first = data[Math.floor(data.length / 2)];
+            second = data[Math.floor(data.length / 2) - 1];
+            return Arithmetic._mean([first, second]);
+        } else {
+            return data[Math.floor(data.length / 2)];
+        }
+    },
+
+
+    /**
+     * Computes standard deviation of a number array and returns the value.
+     *
+     * @private
+     * @param {number[]} data
+     * @returns {number}
+     */
+    _stdDev: function (data) {
+        if (data.length > 0) {
+            let avg = Arithmetic._mean(data);
+            let devSum = 0;
+            for (let i = 0; i < data.length; i++) {
+                devSum += (data[i] - avg) ** 2;
+            }
+            return Math.sqrt(devSum / data.length);
+        }
+    },
+};
+
+export default Arithmetic;
--- a/src/core/operations/BCD.js
+++ b/src/core/operations/BCD.js
@@ -134,11 +134,11 @@ const BCD = {
        switch (outputFormat) {
            case "Nibbles":
                return nibbles.map(n => {
-                    return Utils.padLeft(n.toString(2), 4);
+                    return n.toString(2).padStart(4, "0");
                }).join(" ");
            case "Bytes":
                return bytes.map(b => {
-                    return Utils.padLeft(b.toString(2), 8);
+                    return b.toString(2).padStart(8, "0");
                }).join(" ");
            case "Raw":
            default:
--- a/src/core/operations/Base64.js
+++ b/src/core/operations/Base64.js
@@ -40,13 +40,13 @@ const Base64 = {
    /**
     * To Base64 operation.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {string}
     */
    runTo: function(input, args) {
        const alphabet = args[0] || Base64.ALPHABET;
-        return Utils.toBase64(input, alphabet);
+        return Utils.toBase64(new Uint8Array(input), alphabet);
    },


--- a/src/core/operations/BitwiseOp.js
+++ b/src/core/operations/BitwiseOp.js
@@ -67,7 +67,7 @@ const BitwiseOp = {
     * @constant
     * @default
     */
-    KEY_FORMAT: ["Hex", "Base64", "UTF8", "UTF16", "UTF16LE", "UTF16BE", "Latin1"],
+    KEY_FORMAT: ["Hex", "Base64", "UTF8", "Latin1"],

    /**
     * XOR operation.
@@ -77,12 +77,10 @@ const BitwiseOp = {
     * @returns {byteArray}
     */
    runXor: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || ""),
+        const key = Utils.convertToByteArray(args[0].string || "", args[0].option),
            scheme = args[1],
            nullPreserving = args[2];

-        key = Utils.wordArrayToByteArray(key);
-
        return BitwiseOp._bitOp(input, key, BitwiseOp._xor, nullPreserving, scheme);
    },

@@ -200,8 +198,7 @@ const BitwiseOp = {
     * @returns {byteArray}
     */
    runAnd: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.wordArrayToByteArray(key);
+        const key = Utils.convertToByteArray(args[0].string || "", args[0].option);

        return BitwiseOp._bitOp(input, key, BitwiseOp._and);
    },
@@ -215,8 +212,7 @@ const BitwiseOp = {
     * @returns {byteArray}
     */
    runOr: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.wordArrayToByteArray(key);
+        const key = Utils.convertToByteArray(args[0].string || "", args[0].option);

        return BitwiseOp._bitOp(input, key, BitwiseOp._or);
    },
@@ -230,8 +226,7 @@ const BitwiseOp = {
     * @returns {byteArray}
     */
    runAdd: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.wordArrayToByteArray(key);
+        const key = Utils.convertToByteArray(args[0].string || "", args[0].option);

        return BitwiseOp._bitOp(input, key, BitwiseOp._add);
    },
@@ -245,8 +240,7 @@ const BitwiseOp = {
     * @returns {byteArray}
     */
    runSub: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.wordArrayToByteArray(key);
+        const key = Utils.convertToByteArray(args[0].string || "", args[0].option);

        return BitwiseOp._bitOp(input, key, BitwiseOp._sub);
    },
--- a/src/core/operations/ByteRepr.js
+++ b/src/core/operations/ByteRepr.js
@@ -31,13 +31,13 @@ const ByteRepr = {
    /**
     * To Hex operation.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {string}
     */
    runToHex: function(input, args) {
        const delim = Utils.charRep[args[0] || "Space"];
-        return Utils.toHex(input, delim, 2);
+        return Utils.toHex(new Uint8Array(input), delim, 2);
    },


@@ -186,7 +186,7 @@ const ByteRepr = {
        // 0x and \x are added to the beginning if they are selected, so increment the positions accordingly
        if (delim === "0x" || delim === "\\x") {
            pos[0].start += 2;
-            pos[0].end   += 2;
+            pos[0].end += 2;
        }
        return pos;
    },
@@ -266,7 +266,7 @@ const ByteRepr = {
            padding = 8;

        for (let i = 0; i < input.length; i++) {
-            output += Utils.pad(input[i].toString(2), padding) + delim;
+            output += input[i].toString(2).padStart(padding, "0") + delim;
        }

        if (delim.length) {
--- a/src/core/operations/Cipher.js
+++ b/src/core/operations/Cipher.js
@@ -61,9 +61,9 @@ const Cipher = {
     * @returns {string}
     */
    _enc: function (algo, input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || ""),
-            iv = Utils.format[args[1].option].parse(args[1].string || ""),
-            salt = Utils.format[args[2].option].parse(args[2].string || ""),
+        let key = Cipher._format[args[0].option].parse(args[0].string || ""),
+            iv = Cipher._format[args[1].option].parse(args[1].string || ""),
+            salt = Cipher._format[args[2].option].parse(args[2].string || ""),
            mode = CryptoJS.mode[args[3]],
            padding = CryptoJS.pad[args[4]],
            resultOption = args[5].toLowerCase(),
@@ -83,12 +83,12 @@ const Cipher = {

        let result = "";
        if (resultOption === "show all") {
-            result += "Key:  " + encrypted.key.toString(Utils.format[outputFormat]);
-            result += "\nIV:   " + encrypted.iv.toString(Utils.format[outputFormat]);
-            if (encrypted.salt) result += "\nSalt: " + encrypted.salt.toString(Utils.format[outputFormat]);
-            result += "\n\nCiphertext: " + encrypted.ciphertext.toString(Utils.format[outputFormat]);
+            result += "Key:  " + encrypted.key.toString(Cipher._format[outputFormat]);
+            result += "\nIV:   " + encrypted.iv.toString(Cipher._format[outputFormat]);
+            if (encrypted.salt) result += "\nSalt: " + encrypted.salt.toString(Cipher._format[outputFormat]);
+            result += "\n\nCiphertext: " + encrypted.ciphertext.toString(Cipher._format[outputFormat]);
        } else {
-            result = encrypted[resultOption].toString(Utils.format[outputFormat]);
+            result = encrypted[resultOption].toString(Cipher._format[outputFormat]);
        }

        return result;
@@ -105,9 +105,9 @@ const Cipher = {
     * @returns {string}
     */
    _dec: function (algo, input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string || ""),
-            iv = Utils.format[args[1].option].parse(args[1].string || ""),
-            salt = Utils.format[args[2].option].parse(args[2].string || ""),
+        let key = Cipher._format[args[0].option].parse(args[0].string || ""),
+            iv = Cipher._format[args[1].option].parse(args[1].string || ""),
+            salt = Cipher._format[args[2].option].parse(args[2].string || ""),
            mode = CryptoJS.mode[args[3]],
            padding = CryptoJS.pad[args[4]],
            inputFormat = args[5],
@@ -118,7 +118,7 @@ const Cipher = {
            return "No input";
        }

-        const ciphertext = Utils.format[inputFormat].parse(input);
+        const ciphertext = Cipher._format[inputFormat].parse(input);

        if (iv.sigBytes === 0) {
            // Use passphrase rather than key. Need to convert it to a string.
@@ -136,7 +136,7 @@ const Cipher = {

        let result;
        try {
-            result = decrypted.toString(Utils.format[outputFormat]);
+            result = decrypted.toString(Cipher._format[outputFormat]);
        } catch (err) {
            result = "Decrypt error: " + err.message;
        }
@@ -260,7 +260,7 @@ const Cipher = {
     * @returns {string}
     */
    runBlowfishEnc: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string).toString(Utils.format.Latin1),
+        let key = Cipher._format[args[0].option].parse(args[0].string).toString(Cipher._format.Latin1),
            mode = args[1],
            outputFormat = args[2];

@@ -272,7 +272,7 @@ const Cipher = {
            }),
            enc = CryptoJS.enc.Hex.parse(encHex);

-        return enc.toString(Utils.format[outputFormat]);
+        return enc.toString(Cipher._format[outputFormat]);
    },


@@ -284,13 +284,13 @@ const Cipher = {
     * @returns {string}
     */
    runBlowfishDec: function (input, args) {
-        let key = Utils.format[args[0].option].parse(args[0].string).toString(Utils.format.Latin1),
+        let key = Cipher._format[args[0].option].parse(args[0].string).toString(Cipher._format.Latin1),
            mode = args[1],
            inputFormat = args[2];

        if (key.length === 0) return "Enter a key";

-        input = Utils.format[inputFormat].parse(input);
+        input = Cipher._format[inputFormat].parse(input);

        return Blowfish.decrypt(input.toString(CryptoJS.enc.Base64), key, {
            outputType: 0, // This actually means inputType. The library is weird.
@@ -329,14 +329,14 @@ const Cipher = {
            salt = CryptoJS.enc.Hex.parse(args[3] || ""),
            inputFormat = args[4],
            outputFormat = args[5],
-            passphrase = Utils.format[inputFormat].parse(input),
+            passphrase = Cipher._format[inputFormat].parse(input),
            key = CryptoJS.PBKDF2(passphrase, salt, {
                keySize: keySize,
                hasher: CryptoJS.algo[hasher],
                iterations: iterations,
            });

-        return key.toString(Utils.format[outputFormat]);
+        return key.toString(Cipher._format[outputFormat]);
    },


@@ -354,14 +354,14 @@ const Cipher = {
            salt = CryptoJS.enc.Hex.parse(args[3] || ""),
            inputFormat = args[4],
            outputFormat = args[5],
-            passphrase = Utils.format[inputFormat].parse(input),
+            passphrase = Cipher._format[inputFormat].parse(input),
            key = CryptoJS.EvpKDF(passphrase, salt, {
                keySize: keySize,
                hasher: CryptoJS.algo[hasher],
                iterations: iterations,
            });

-        return key.toString(Utils.format[outputFormat]);
+        return key.toString(Cipher._format[outputFormat]);
    },


@@ -373,11 +373,11 @@ const Cipher = {
     * @returns {string}
     */
    runRc4: function (input, args) {
-        let message = Utils.format[args[1]].parse(input),
-            passphrase = Utils.format[args[0].option].parse(args[0].string),
+        let message = Cipher._format[args[1]].parse(input),
+            passphrase = Cipher._format[args[0].option].parse(args[0].string),
            encrypted = CryptoJS.RC4.encrypt(message, passphrase);

-        return encrypted.ciphertext.toString(Utils.format[args[2]]);
+        return encrypted.ciphertext.toString(Cipher._format[args[2]]);
    },


@@ -395,12 +395,12 @@ const Cipher = {
     * @returns {string}
     */
    runRc4drop: function (input, args) {
-        let message = Utils.format[args[1]].parse(input),
-            passphrase = Utils.format[args[0].option].parse(args[0].string),
+        let message = Cipher._format[args[1]].parse(input),
+            passphrase = Cipher._format[args[0].option].parse(args[0].string),
            drop = args[3],
            encrypted = CryptoJS.RC4Drop.encrypt(message, passphrase, { drop: drop });

-        return encrypted.ciphertext.toString(Utils.format[args[2]]);
+        return encrypted.ciphertext.toString(Cipher._format[args[2]]);
    },


@@ -783,6 +783,23 @@ const Cipher = {
        return output;
    },

+
+    /**
+     * A mapping of string formats to their classes in the CryptoJS library.
+     * 
+     * @private
+     * @constant
+     */
+    _format: {
+        "Hex":     CryptoJS.enc.Hex,
+        "Base64":  CryptoJS.enc.Base64,
+        "UTF8":    CryptoJS.enc.Utf8,
+        "UTF16":   CryptoJS.enc.Utf16,
+        "UTF16LE": CryptoJS.enc.Utf16LE,
+        "UTF16BE": CryptoJS.enc.Utf16BE,
+        "Latin1":  CryptoJS.enc.Latin1,
+    },
+
 };

 export default Cipher;
@@ -827,3 +844,27 @@ CryptoJS.kdf.OpenSSL.execute = function (password, keySize, ivSize, salt) {
    // Return params
    return CryptoJS.lib.CipherParams.create({ key: key, iv: iv, salt: salt });
 };
+
+
+/**
+ * Override for the CryptoJS Hex encoding parser to remove whitespace before attempting to parse
+ * the hex string.
+ *
+ * @param {string} hexStr
+ * @returns {CryptoJS.lib.WordArray}
+ */
+CryptoJS.enc.Hex.parse = function (hexStr) {
+    // Remove whitespace
+    hexStr = hexStr.replace(/\s/g, "");
+
+    // Shortcut
+    const hexStrLength = hexStr.length;
+
+    // Convert
+    const words = [];
+    for (let i = 0; i < hexStrLength; i += 2) {
+        words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+    }
+
+    return new CryptoJS.lib.WordArray.init(words, hexStrLength / 2);
+};
--- a/src/core/operations/Code.js
+++ b/src/core/operations/Code.js
@@ -2,9 +2,10 @@ import {camelCase, kebabCase, snakeCase} from "lodash";

 import Utils from "../Utils.js";
 import vkbeautify from "vkbeautify";
-import {DOMParser as dom} from "xmldom";
+import {DOMParser} from "xmldom";
 import xpath from "xpath";
 import jpath from "jsonpath";
+import nwmatcher from "nwmatcher";
 import prettyPrintOne from "imports-loader?window=>global!exports-loader?prettyPrintOne!google-code-prettify/bin/prettify.min.js";


@@ -336,7 +337,7 @@ const Code = {

        let doc;
        try {
-            doc = new dom().parseFromString(input);
+            doc = new DOMParser().parseFromString(input, "application/xml");
        } catch (err) {
            return "Invalid input XML.";
        }
@@ -423,7 +424,7 @@ const Code = {
        let query = args[0],
            delimiter = args[1],
            parser = new DOMParser(),
-            html,
+            dom,
            result;

        if (!query.length || !input.length) {
@@ -431,32 +432,32 @@ const Code = {
        }

        try {
-            html = parser.parseFromString(input, "text/html");
+            dom = parser.parseFromString(input);
        } catch (err) {
            return "Invalid input HTML.";
        }

        try {
-            result = html.querySelectorAll(query);
+            const matcher = nwmatcher({document: dom});
+            result = matcher.select(query, dom);
        } catch (err) {
            return "Invalid CSS Selector. Details:\n" + err.message;
        }

        const nodeToString = function(node) {
+            return node.toString();
+            /* xmldom does not return the outerHTML value.
            switch (node.nodeType) {
-                case Node.ELEMENT_NODE: return node.outerHTML;
-                case Node.ATTRIBUTE_NODE: return node.value;
-                case Node.COMMENT_NODE: return node.data;
-                case Node.TEXT_NODE: return node.wholeText;
-                case Node.DOCUMENT_NODE: return node.outerHTML;
+                case node.ELEMENT_NODE: return node.outerHTML;
+                case node.ATTRIBUTE_NODE: return node.value;
+                case node.TEXT_NODE: return node.wholeText;
+                case node.COMMENT_NODE: return node.data;
+                case node.DOCUMENT_NODE: return node.outerHTML;
                default: throw new Error("Unknown Node Type: " + node.nodeType);
-            }
+            }*/
        };

-        return Array.apply(null, Array(result.length))
-            .map(function(_, i) {
-                return result[i];
-            })
+        return result
            .map(nodeToString)
            .join(delimiter);
    },
--- a/src/core/operations/Compress.js
+++ b/src/core/operations/Compress.js
@@ -418,9 +418,9 @@ const Compress = {
            }
        };

-        const fileSize = Utils.padLeft(input.length.toString(8), 11, "0");
+        const fileSize = input.length.toString(8).padStart(11, "0");
        const currentUnixTimestamp = Math.floor(Date.now() / 1000);
-        const lastModTime = Utils.padLeft(currentUnixTimestamp.toString(8), 11, "0");
+        const lastModTime = currentUnixTimestamp.toString(8).padStart(11, "0");

        const file = {
            fileName: Utils.padBytesRight(args[0], 100),
@@ -452,7 +452,7 @@ const Compress = {
                }
            });
        }
-        checksum = Utils.padBytesRight(Utils.padLeft(checksum.toString(8), 7, "0"), 8);
+        checksum = Utils.padBytesRight(checksum.toString(8).padStart(7, "0"), 8);
        file.checksum = checksum;

        const tarball = new Tarball();
--- a/src/core/operations/Entropy.js
+++ b/src/core/operations/Entropy.js
@@ -81,22 +81,23 @@ const Entropy = {
    /**
     * Frequency distribution operation.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {html}
     */
    runFreqDistrib: function (input, args) {
-        if (!input.length) return "No data";
+        const data = new Uint8Array(input);
+        if (!data.length) return "No data";

        let distrib = new Array(256).fill(0),
            percentages = new Array(256),
-            len = input.length,
+            len = data.length,
            showZeroes = args[0],
            i;

        // Count bytes
        for (i = 0; i < len; i++) {
-            distrib[input[i]]++;
+            distrib[data[i]]++;
        }

        // Calculate percentages
@@ -126,7 +127,7 @@ const Entropy = {
        for (i = 0; i < 256; i++) {
            if (distrib[i] || showZeroes) {
                output += " " + Utils.hex(i, 2) + "    (" +
-                        Utils.padRight(percentages[i].toFixed(2).replace(".00", "") + "%)", 8) +
+                        (percentages[i].toFixed(2).replace(".00", "") + "%)").padEnd(8, " ") +
                        Array(Math.ceil(percentages[i])+1).join("|") + "\n";
            }
        }
@@ -135,6 +136,32 @@ const Entropy = {
    },


+    /**
+     * Chi Square operation.
+     *
+     * @param {ArrayBuffer} data
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runChiSq: function(input, args) {
+        const data = new Uint8Array(input);
+        let distArray = new Array(256).fill(0),
+            total = 0;
+
+        for (let i = 0; i < data.length; i++) {
+            distArray[data[i]]++;
+        }
+
+        for (let i = 0; i < distArray.length; i++) {
+            if (distArray[i] > 0) {
+                total += Math.pow(distArray[i] - data.length / 256, 2) / (data.length / 256);
+            }
+        }
+
+        return total;
+    },
+
+
    /**
     * Calculates the Shannon entropy for a given chunk of data.
     *
--- a/src/core/operations/FileType.js
+++ b/src/core/operations/FileType.js
@@ -15,12 +15,13 @@ const FileType = {
    /**
     * Detect File Type operation.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {string}
     */
    runDetect: function(input, args) {
-        const type = FileType.magicType(input);
+        const data = new Uint8Array(input),
+            type = FileType.magicType(data);

        if (!type) {
            return "Unknown file type. Have you tried checking the entropy of this data to determine whether it might be encrypted or compressed?";
@@ -46,20 +47,21 @@ const FileType = {
    /**
     * Scan for Embedded Files operation.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {string}
     */
    runScanForEmbeddedFiles: function(input, args) {
        let output = "Scanning data for 'magic bytes' which may indicate embedded files. The following results may be false positives and should not be treat as reliable. Any suffiently long file is likely to contain these magic bytes coincidentally.\n",
            type,
-            ignoreCommon = args[0],
-            commonExts = ["ico", "ttf", ""],
            numFound = 0,
            numCommonFound = 0;
+        const ignoreCommon = args[0],
+            commonExts = ["ico", "ttf", ""],
+            data = new Uint8Array(input);

-        for (let i = 0; i < input.length; i++) {
-            type = FileType.magicType(input.slice(i));
+        for (let i = 0; i < data.length; i++) {
+            type = FileType.magicType(data.slice(i));
            if (type) {
                if (ignoreCommon && commonExts.indexOf(type.ext) > -1) {
                    numCommonFound++;
@@ -96,7 +98,7 @@ const FileType = {
     * Given a buffer, detects magic byte sequences at specific positions and returns the
     * extension and mime type.
     *
-     * @param {byteArray} buf
+     * @param {Uint8Array} buf
     * @returns {Object} type
     * @returns {string} type.ext - File extension
     * @returns {string} type.mime - Mime type
--- a/src/core/operations/HTML.js
+++ b/src/core/operations/HTML.js
@@ -215,9 +215,9 @@ const HTML = {
        k = k.toFixed(2);

        let hex = "#" +
-                Utils.padLeft(Math.round(r).toString(16), 2) +
-                Utils.padLeft(Math.round(g).toString(16), 2) +
-                Utils.padLeft(Math.round(b).toString(16), 2),
+                Math.round(r).toString(16).padStart(2, "0") +
+                Math.round(g).toString(16).padStart(2, "0") +
+                Math.round(b).toString(16).padStart(2, "0"),
            rgb  = "rgb(" + r + ", " + g + ", " + b + ")",
            rgba = "rgba(" + r + ", " + g + ", " + b + ", " + a + ")",
            hsl  = "hsl(" + h + ", " + s + "%, " + l + "%)",
--- a/src/core/operations/Hash.js
+++ b/src/core/operations/Hash.js
@@ -16,6 +16,22 @@ import Checksum from "./Checksum.js";
 */
 const Hash = {

+    /**
+     * Generic hash function.
+     *
+     * @param {string} name
+     * @param {string} input
+     * @returns {string}
+     */
+    runHash: function(name, input) {
+        const hasher = CryptoApi.hasher(name);
+        hasher.state.message = input;
+        hasher.state.length += input.length;
+        hasher.process();
+        return hasher.finalize().stringify("hex");
+    },
+
+
    /**
     * MD2 operation.
     *
@@ -24,7 +40,7 @@ const Hash = {
     * @returns {string}
     */
    runMD2: function (input, args) {
-        return CryptoApi.hash("md2", input, {}).stringify("hex");
+        return Hash.runHash("md2", input);
    },


@@ -36,7 +52,7 @@ const Hash = {
     * @returns {string}
     */
    runMD4: function (input, args) {
-        return CryptoApi.hash("md4", input, {}).stringify("hex");
+        return Hash.runHash("md4", input);
    },


@@ -48,7 +64,7 @@ const Hash = {
     * @returns {string}
     */
    runMD5: function (input, args) {
-        return CryptoApi.hash("md5", input, {}).stringify("hex");
+        return Hash.runHash("md5", input);
    },


@@ -92,7 +108,7 @@ const Hash = {
     * @returns {string}
     */
    runSHA0: function (input, args) {
-        return CryptoApi.hash("sha0", input, {}).stringify("hex");
+        return Hash.runHash("sha0", input);
    },


@@ -104,7 +120,7 @@ const Hash = {
     * @returns {string}
     */
    runSHA1: function (input, args) {
-        return CryptoApi.hash("sha1", input, {}).stringify("hex");
+        return Hash.runHash("sha1", input);
    },


@@ -123,7 +139,7 @@ const Hash = {
     */
    runSHA2: function (input, args) {
        const size = args[0];
-        return CryptoApi.hash("sha" + size, input, {}).stringify("hex");
+        return Hash.runHash("sha" + size, input);
    },


@@ -259,7 +275,7 @@ const Hash = {
     */
    runRIPEMD: function (input, args) {
        const size = args[0];
-        return CryptoApi.hash("ripemd" + size, input, {}).stringify("hex");
+        return Hash.runHash("ripemd" + size, input);
    },


@@ -271,7 +287,7 @@ const Hash = {
     * @returns {string}
     */
    runHAS: function (input, args) {
-        return CryptoApi.hash("has160", input, {}).stringify("hex");
+        return Hash.runHash("has160", input);
    },


@@ -290,7 +306,7 @@ const Hash = {
     */
    runWhirlpool: function (input, args) {
        const variant = args[0].toLowerCase();
-        return CryptoApi.hash(variant, input, {}).stringify("hex");
+        return Hash.runHash(variant, input);
    },


@@ -315,7 +331,7 @@ const Hash = {
    runSnefru: function (input, args) {
        const rounds = args[0],
            size = args[1];
-        return CryptoApi.hash(`snefru-${rounds}-${size}`, input, {}).stringify("hex");
+        return Hash.runHash(`snefru-${rounds}-${size}`, input);
    },


--- a/src/core/operations/Hexdump.js
+++ b/src/core/operations/Hexdump.js
@@ -31,18 +31,19 @@ const Hexdump = {
    /**
     * To Hexdump operation.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {string}
     */
    runTo: function(input, args) {
+        const data = new Uint8Array(input);
        const length = args[0] || Hexdump.WIDTH;
        const upperCase = args[1];
        const includeFinalLength = args[2];

        let output = "", padding = 2;
-        for (let i = 0; i < input.length; i += length) {
-            const buff = input.slice(i, i+length);
+        for (let i = 0; i < data.length; i += length) {
+            const buff = data.slice(i, i+length);
            let hexa = "";
            for (let j = 0; j < buff.length; j++) {
                hexa += Utils.hex(buff[j], padding) + " ";
@@ -56,10 +57,10 @@ const Hexdump = {
            }

            output += lineNo + "  " +
-                Utils.padRight(hexa, (length*(padding+1))) +
-                " |" + Utils.padRight(Utils.printable(Utils.byteArrayToChars(buff)), buff.length) + "|\n";
+                hexa.padEnd(length*(padding+1), " ") +
+                " |" + Utils.printable(Utils.byteArrayToChars(buff)).padEnd(buff.length, " ") + "|\n";

-            if (includeFinalLength && i+buff.length === input.length) {
+            if (includeFinalLength && i+buff.length === data.length) {
                output += Utils.hex(i+buff.length, 8) + "\n";
            }
        }
--- a/src/core/operations/Image.js
+++ b/src/core/operations/Image.js
@@ -20,14 +20,13 @@ const Image = {
     *
     * Extracts EXIF data from a byteArray, representing a JPG or a TIFF image.
     *
-     * @param {byteArray} input
+     * @param {ArrayBuffer} input
     * @param {Object[]} args
     * @returns {string}
     */
    runExtractEXIF(input, args) {
        try {
-            const bytes = Uint8Array.from(input);
-            const parser = ExifParser.create(bytes.buffer);
+            const parser = ExifParser.create(input);
            const result = parser.parse();

            let lines = [];
@@ -53,7 +52,7 @@ const Image = {
     * @author David Moodie [davidmoodie12@gmail.com]
     * @param {byteArray} input
     * @param {Object[]} args
-     * @returns {string}
+     * @returns {byteArray}
     */
    runRemoveEXIF(input, args) {
        // Do nothing if input is empty
--- a/src/core/operations/MS.js
+++ b/src/core/operations/MS.js
@@ -1,5 +1,5 @@
 /**
- * Microsoft operations. 
+ * Microsoft operations.
 *
 * @author bmwhitn [brian.m.whitney@outlook.com]
 * @copyright Crown Copyright 2017
--- a/src/core/operations/NetBIOS.js
+++ b/src/core/operations/NetBIOS.js
@@ -26,9 +26,14 @@ const NetBIOS = {
        let output = [],
            offset = args[0];

-        for (let i = 0; i < input.length; i++) {
-            output.push((input[i] >> 4) + offset);
-            output.push((input[i] & 0xf) + offset);
+        if (input.length <= 16) {
+            let len = input.length;
+            input.length = 16;
+            input.fill(32, len, 16);
+            for (let i = 0; i < input.length; i++) {
+                output.push((input[i] >> 4) + offset);
+                output.push((input[i] & 0xf) + offset);
+            }
        }

        return output;
@@ -46,9 +51,15 @@ const NetBIOS = {
        let output = [],
            offset = args[0];

-        for (let i = 0; i < input.length; i += 2) {
-            output.push(((input[i] - offset) << 4) |
-                        ((input[i + 1] - offset) & 0xf));
+        if (input.length <= 32 && (input.length % 2) === 0) {
+            for (let i = 0; i < input.length; i += 2) {
+                output.push((((input[i] & 0xff) - offset) << 4) |
+                            (((input[i + 1] & 0xff) - offset) & 0xf));
+            }
+            for (let i = output.length - 1; i > 0; i--) {
+                if (output[i] === 32) output.splice(i, i);
+                else break;
+            }
        }

        return output;
--- a/src/core/operations/Numberwang.js
+++ b/src/core/operations/Numberwang.js
@@ -14,16 +14,72 @@ const Numberwang = {
     * @returns {string}
     */
    run: function(input, args) {
-        if (!input) return "Let's play Wangernumb!";
-        const match = input.match(/\d+/);
-        if (match) {
-            return match[0] + "! That's Numberwang!";
+        let output;
+        if (!input) {
+            output = "Let's play Wangernumb!";
        } else {
-            // That's a bad miss!
-            return "Sorry, that's not Numberwang. Let's rotate the board!";
+            const match = input.match(/(f0rty-s1x|shinty-six|filth-hundred and neeb|-?√?\d+(\.\d+)?i?([a-z]?)%?)/i);
+            if (match) {
+                if (match[3]) output = match[0] + "! That's AlphaNumericWang!";
+                else output = match[0] + "! That's Numberwang!";
+            } else {
+                // That's a bad miss!
+                output = "Sorry, that's not Numberwang. Let's rotate the board!";
+            }
        }
+
+        const rand = Math.floor(Math.random() * Numberwang._didYouKnow.length);
+        return output + "\n\nDid you know: " + Numberwang._didYouKnow[rand];
    },

+
+    /**
+     * Taken from http://numberwang.wikia.com/wiki/Numberwang_Wikia
+     *
+     * @private
+     * @constant
+     */
+    _didYouKnow: [
+        "Numberwang, contrary to popular belief, is a fruit and not a vegetable.",
+        "Robert Webb once got WordWang while presenting an episode of Numberwang.",
+        "The 6705th digit of pi is Numberwang.",
+        "Numberwang was invented on a Sevenday.",
+        "Contrary to popular belief, Albert Einstein always got good grades in Numberwang at school. He once scored ^4$ on a test.",
+        "680 asteroids have been named after Numberwang.",
+        "Archimedes is most famous for proclaiming \"That's Numberwang!\" during an epiphany about water displacement he had while taking a bath.",
+        "Numberwang Day is celebrated in Japan on every day of the year apart from June 6.",
+        "Biologists recently discovered Numberwang within a strand of human DNA.",
+        "Numbernot is a special type of non-Numberwang number. It is divisible by 3 and the letter \"y\".",
+        "Julie once got 612.04 Numberwangs in a single episode of Emmerdale.",
+        "In India, it is traditional to shout out \"Numberwang!\" instead of checkmate during games of chess.",
+        "There is a rule on Countdown which states that if you get Numberwang in the numbers round, you automatically win. It has only ever been invoked twice.",
+        "\"Numberwang\" was the third-most common baby name for a brief period in 1722.",
+        "\"The Lion King\" was loosely based on Numberwang.",
+        "\"A Numberwang a day keeps the doctor away\" is how Donny Cosy, the oldest man in the world, explained how he was in such good health at the age of 136.",
+        "The \"number lock\" button on a keyboard is based on the popular round of the same name in \"Numberwang\".",
+        "Cambridge became the first university to offer a course in Numberwang in 1567.",
+        "Schrödinger's Numberwang is a number that has been confusing dentists for centuries.",
+        "\"Harry Potter and the Numberwang of Numberwang\" was rejected by publishers -41 times before it became a bestseller.",
+        "\"Numberwang\" is the longest-running British game show in history; it has aired 226 seasons, each containing 19 episodes, which makes a grand total of 132 episodes.",
+        "The triple Numberwang bonus was discovered by archaeologist Thomas Jefferson in Somerset.",
+        "Numberwang is illegal in parts of Czechoslovakia.",
+        "Numberwang was discovered in India in the 12th century.",
+        "Numberwang has the chemical formula Zn4SO2(HgEs)3.",
+        "The first pack of cards ever created featured two \"Numberwang\" cards instead of jokers.",
+        "Julius Caesar was killed by an overdose of Numberwang.",
+        "The most Numberwang musical note is G#.",
+        "In 1934, the forty-third Google Doodle promoted the upcoming television show \"Numberwang on Ice\".",
+        "A recent psychology study found that toddlers were 17% faster at identifying numbers which were Numberwang.",
+        "There are 700 ways to commit a foul in the television show \"Numberwang\". All 700 of these fouls were committed by Julie in one single episode in 1473.",
+        "Astronomers suspect God is Numberwang.",
+        "Numberwang is the official beverage of Canada.",
+        "In the pilot episode of \"The Price is Right\", if a contestant got the value of an item exactly right they were told \"That's Numberwang!\" and immediately won ₹5.7032.",
+        "The first person to get three Numberwangs in a row was Madonna.",
+        "\"Numberwang\" has the code U+46402 in Unicode.",
+        "The musical note \"Numberwang\" is between D# and E♮.",
+        "Numberwang was first played on the moon in 1834.",
+    ],
+
 };

 export default Numberwang;
--- a/src/core/operations/OTP.js
+++ b/src/core/operations/OTP.js
@@ -1,6 +1,7 @@
 import otp from "otp";
 import Base64 from "./Base64.js";

+
 /**
 * One-Time Password operations.
 *
--- a/src/core/operations/PHP.js
+++ b/src/core/operations/PHP.js
@@ -0,0 +1,160 @@
+/**
+ * PHP operations.
+ *
+ * @author Jarmo van Lenthe [github.com/jarmovanlenthe]
+ * @copyright Jarmo van Lenthe
+ * @license Apache-2.0
+ *
+ * @namespace
+ */
+const PHP = {
+
+    /**
+     * @constant
+     * @default
+     */
+    OUTPUT_VALID_JSON: true,
+
+    /**
+     * PHP Deserialize operation.
+     *
+     * This Javascript implementation is based on the Python implementation by
+     * Armin Ronacher (2016), who released it under the 3-Clause BSD license.
+     * See: https://github.com/mitsuhiko/phpserialize/
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    runDeserialize: function (input, args) {
+        /**
+         * Recursive method for deserializing.
+         * @returns {*}
+         */
+        function handleInput() {
+            /**
+             * Read `length` characters from the input, shifting them out the input.
+             * @param length
+             * @returns {string}
+             */
+            function read(length) {
+                let result = "";
+                for (let idx = 0; idx < length; idx++) {
+                    let char = inputPart.shift();
+                    if (char === undefined) {
+                        throw "End of input reached before end of script";
+                    }
+                    result += char;
+                }
+                return result;
+            }
+
+            /**
+             * Read characters from the input until `until` is found.
+             * @param until
+             * @returns {string}
+             */
+            function readUntil(until) {
+                let result = "";
+                for (;;) {
+                    let char = read(1);
+                    if (char === until) {
+                        break;
+                    } else {
+                        result += char;
+                    }
+                }
+                return result;
+
+            }
+
+            /**
+             * Read characters from the input that must be equal to `expect`
+             * @param expect
+             * @returns {string}
+             */
+            function expect(expect) {
+                let result = read(expect.length);
+                if (result !== expect) {
+                    throw "Unexpected input found";
+                }
+                return result;
+            }
+
+            /**
+             * Helper function to handle deserialized arrays.
+             * @returns {Array}
+             */
+            function handleArray() {
+                let items = parseInt(readUntil(":"), 10) * 2;
+                expect("{");
+                let result = [];
+                let isKey = true;
+                let lastItem = null;
+                for (let idx = 0; idx < items; idx++) {
+                    let item = handleInput();
+                    if (isKey) {
+                        lastItem = item;
+                        isKey = false;
+                    } else {
+                        let numberCheck = lastItem.match(/[0-9]+/);
+                        if (args[0] && numberCheck && numberCheck[0].length === lastItem.length) {
+                            result.push("\"" + lastItem + "\": " + item);
+                        } else {
+                            result.push(lastItem + ": " + item);
+                        }
+                        isKey = true;
+                    }
+                }
+                expect("}");
+                return result;
+            }
+
+
+            let kind = read(1).toLowerCase();
+
+            switch (kind) {
+                case "n":
+                    expect(";");
+                    return "";
+
+                case "i":
+                case "d":
+                case "b": {
+                    expect(":");
+                    let data = readUntil(";");
+                    if (kind === "b") {
+                        return (parseInt(data, 10) !== 0);
+                    }
+                    return data;
+                }
+
+                case "a":
+                    expect(":");
+                    return "{" + handleArray() + "}";
+
+                case "s": {
+                    expect(":");
+                    let length = readUntil(":");
+                    expect("\"");
+                    let value = read(length);
+                    expect("\";");
+                    if (args[0]) {
+                        return "\"" + value.replace(/"/g, "\\\"") + "\"";
+                    } else {
+                        return "\"" + value + "\"";
+                    }
+                }
+
+                default:
+                    throw "Unknown type: " + kind;
+            }
+        }
+
+        let inputPart = input.split("");
+        return handleInput();
+    }
+
+};
+
+export default PHP;
--- a/src/core/operations/PublicKey.js
+++ b/src/core/operations/PublicKey.js
@@ -121,8 +121,7 @@ const PublicKey = {
        // Format Public Key fields
        for (let i = 0; i < pkFields.length; i++) {
            pkStr += "  " + pkFields[i].key + ":" +
-                Utils.padLeft(
-                    pkFields[i].value + "\n",
+                (pkFields[i].value + "\n").padStart(
                    18 - (pkFields[i].key.length + 3) + pkFields[i].value.length + 1,
                    " "
                );
@@ -286,9 +285,9 @@ ${extensions}`;

            key = fields[i].split("=")[0];
            value = fields[i].split("=")[1];
-            str = Utils.padRight(key, maxKeyLen) + " = " + value + "\n";
+            str = key.padEnd(maxKeyLen, " ") + " = " + value + "\n";

-            output += Utils.padLeft(str, indent + str.length, " ");
+            output += str.padStart(indent + str.length, " ");
        }

        return output.slice(0, -1);
@@ -314,7 +313,7 @@ ${extensions}`;
            if (i === 0) {
                output += str;
            } else {
-                output += Utils.padLeft(str, indent + str.length, " ");
+                output += str.padStart(indent + str.length, " ");
            }
        }

--- a/src/core/operations/SeqUtils.js
+++ b/src/core/operations/SeqUtils.js
@@ -158,7 +158,7 @@ const SeqUtils = {
            width = lines.length.toString().length;

        for (let n = 0; n < lines.length; n++) {
-            output += Utils.pad((n+1).toString(), width, " ") + " " + lines[n] + "\n";
+            output += (n+1).toString().padStart(width, " ") + " " + lines[n] + "\n";
        }
        return output.slice(0, output.length-1);
    },
@@ -249,7 +249,7 @@ const SeqUtils = {
            }
        }

-        return 0;
+        return a.localeCompare(b);
    },

 };
--- a/src/core/operations/Tidy.js
+++ b/src/core/operations/Tidy.js
@@ -1,6 +1,3 @@
-import Utils from "../Utils.js";
-
-
 /**
 * Tidy operations.
 *
@@ -229,11 +226,11 @@ const Tidy = {

        if (position === "Start") {
            for (i = 0; i < lines.length; i++) {
-                output += Utils.padLeft(lines[i], lines[i].length+len, chr) + "\n";
+                output += lines[i].padStart(lines[i].length+len, chr) + "\n";
            }
        } else if (position === "End") {
            for (i = 0; i < lines.length; i++) {
-                output += Utils.padRight(lines[i], lines[i].length+len, chr) + "\n";
+                output += lines[i].padEnd(lines[i].length+len, chr) + "\n";
            }
        }

--- a/src/core/operations/URL.js
+++ b/src/core/operations/URL.js
@@ -1,5 +1,5 @@
 /* globals unescape */
-import Utils from "../Utils.js";
+import url from "url";


 /**
@@ -58,56 +58,36 @@ const URL_ = {
     * @returns {string}
     */
    runParse: function(input, args) {
-        if (!document) {
-            throw "This operation only works in a browser.";
-        }
+        const uri = url.parse(input, true);

-        const a = document.createElement("a");
+        let output = "";

-        // Overwrite base href which will be the current CyberChef URL to reduce confusion.
-        a.href = "http://example.com/";
-        a.href = input;
+        if (uri.protocol) output += "Protocol:\t" + uri.protocol + "\n";
+        if (uri.auth) output += "Auth:\t\t" + uri.auth + "\n";
+        if (uri.hostname) output += "Hostname:\t" + uri.hostname + "\n";
+        if (uri.port) output += "Port:\t\t" + uri.port + "\n";
+        if (uri.pathname) output += "Path name:\t" + uri.pathname + "\n";
+        if (uri.query) {
+            let keys = Object.keys(uri.query),
+                padding = 0;

-        if (a.protocol) {
-            let output = "";
-            if (a.hostname !== window.location.hostname) {
-                output = "Protocol:\t" + a.protocol + "\n";
-                if (a.hostname) output += "Hostname:\t" + a.hostname + "\n";
-                if (a.port) output += "Port:\t\t" + a.port + "\n";
-            }
+            keys.forEach(k => {
+                padding = (k.length > padding) ? k.length : padding;
+            });

-            if (a.pathname && a.pathname !== window.location.pathname) {
-                let pathname = a.pathname;
-                if (pathname.indexOf(window.location.pathname) === 0)
-                    pathname = pathname.replace(window.location.pathname, "");
-                if (pathname)
-                    output += "Path name:\t" + pathname + "\n";
-            }
-
-            if (a.hash && a.hash !== window.location.hash) {
-                output += "Hash:\t\t" + a.hash + "\n";
-            }
-
-            if (a.search && a.search !== window.location.search) {
-                output += "Arguments:\n";
-                const args_ = (a.search.slice(1, a.search.length)).split("&");
-                let splitArgs = [], padding = 0, i;
-                for (i = 0; i < args_.length; i++) {
-                    splitArgs.push(args_[i].split("="));
-                    padding = (splitArgs[i][0].length > padding) ? splitArgs[i][0].length : padding;
-                }
-                for (i = 0; i < splitArgs.length; i++) {
-                    output += "\t" + Utils.padRight(splitArgs[i][0], padding);
-                    if (splitArgs[i].length > 1 && splitArgs[i][1].length)
-                        output += " = " + splitArgs[i][1] + "\n";
-                    else output += "\n";
+            output += "Arguments:\n";
+            for (let key in uri.query) {
+                output += "\t" + key.padEnd(padding, " ");
+                if (uri.query[key].length) {
+                    output += " = " + uri.query[key] + "\n";
+                } else {
+                    output += "\n";
                }
            }
-
-            return output;
        }
+        if (uri.hash) output += "Hash:\t\t" + uri.hash + "\n";

-        return "Invalid URI";
+        return output;
    },


--- a/src/core/operations/UUID.js
+++ b/src/core/operations/UUID.js
@@ -1,3 +1,6 @@
+import crypto from "crypto";
+
+
 /**
 * UUID operations.
 *
@@ -17,25 +20,17 @@ const UUID = {
     * @returns {string}
     */
    runGenerateV4: function(input, args) {
-        if (window && typeof(window.crypto) !== "undefined" && typeof(window.crypto.getRandomValues) !== "undefined") {
-            let buf = new Uint32Array(4),
-                i = 0;
-            window.crypto.getRandomValues(buf);
-            return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-                let r = (buf[i >> 3] >> ((i % 8) * 4)) & 0xf,
-                    v = c === "x" ? r : (r & 0x3 | 0x8);
-                i++;
-                return v.toString(16);
-            });
-        } else {
-            return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-                let r = Math.random() * 16 | 0,
-                    v = c === "x" ? r : (r & 0x3 | 0x8);
-                return v.toString(16);
-            });
-        }
-    },
-
+        const buf = new Uint32Array(4).map(() => {
+            return crypto.randomBytes(4).readUInt32BE(0, true);
+        });
+        let i = 0;
+        return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+            let r = (buf[i >> 3] >> ((i % 8) * 4)) & 0xf,
+                v = c === "x" ? r : (r & 0x3 | 0x8);
+            i++;
+            return v.toString(16);
+        });
+    }
 };

 export default UUID;
--- a/src/web/App.js
+++ b/src/web/App.js
@@ -49,9 +49,11 @@ App.prototype.setup = function() {
    this.manager.setup();
    this.resetLayout();
    this.setCompileMessage();
-    this.loadURIParams();

+    log.debug("App loaded");
    this.appLoaded = true;
+
+    this.loadURIParams();
    this.loaded();
 };

@@ -88,9 +90,10 @@ App.prototype.loaded = function() {
 * An error handler for displaying the error to the user.
 *
 * @param {Error} err
+ * @param {boolean} [logToConsole=false]
 */
-App.prototype.handleError = function(err) {
-    console.error(err);
+App.prototype.handleError = function(err, logToConsole) {
+    if (logToConsole) log.error(err);
    const msg = err.displayStr || err.toString();
    this.alert(msg, "danger", this.options.errorTimeout, !this.options.showErrors);
 };
@@ -128,6 +131,7 @@ App.prototype.autoBake = function() {
    if (this.autoBakePause) return false;

    if (this.autoBake_ && !this.baking) {
+        log.debug("Auto-baking");
        this.bake();
    } else {
        this.manager.controls.showStaleIndicator();
@@ -528,7 +532,7 @@ App.prototype.setCompileMessage = function() {

 /**
 * Determines whether the browser supports Local Storage and if it is accessible.
- * 
+ *
 * @returns {boolean}
 */
 App.prototype.isLocalStorageAvailable = function() {
@@ -568,7 +572,7 @@ App.prototype.isLocalStorageAvailable = function() {
 App.prototype.alert = function(str, style, timeout, silent) {
    const time = new Date();

-    console.log("[" + time.toLocaleString() + "] " + str);
+    log.info("[" + time.toLocaleString() + "] " + str);
    if (silent) return;

    style = style || "danger";
--- a/src/web/BindingsWaiter.js
+++ b/src/web/BindingsWaiter.js
@@ -0,0 +1,217 @@
+/**
+ * Waiter to handle keybindings to CyberChef functions (i.e. Bake, Step, Save, Load etc.)
+ *
+ * @author Matt C [matt@artemisbot.uk]
+ * @copyright Crown Copyright 2016
+ * @license Apache-2.0
+ *
+ * @constructor
+ * @param {App} app - The main view object for CyberChef.
+ * @param {Manager} manager - The CyberChef event manager.
+ */
+const BindingsWaiter = function (app, manager) {
+    this.app = app;
+    this.manager = manager;
+};
+
+
+/**
+ * Handler for all keydown events
+ * Checks whether valid keyboard shortcut has been instated
+ *
+ * @fires Manager#statechange
+ * @param {event} e
+ */
+BindingsWaiter.prototype.parseInput = function(e) {
+    const modKey = this.app.options.useMetaKey ? e.metaKey : e.altKey;
+
+    if (e.ctrlKey && modKey) {
+        let elem;
+        switch (e.code) {
+            case "KeyF": // Focus search
+                e.preventDefault();
+                document.getElementById("search").focus();
+                break;
+            case "KeyI": // Focus input
+                e.preventDefault();
+                document.getElementById("input-text").focus();
+                break;
+            case "KeyO": // Focus output
+                e.preventDefault();
+                document.getElementById("output-text").focus();
+                break;
+            case "Period": // Focus next operation
+                e.preventDefault();
+                try {
+                    elem = document.activeElement.closest(".operation") || document.querySelector("#rec-list .operation");
+                    if (elem.parentNode.lastChild === elem) {
+                        // If operation is last in recipe, loop around to the top operation's first argument
+                        elem.parentNode.firstChild.querySelectorAll(".arg")[0].focus();
+                    } else {
+                        // Focus first argument of next operation
+                        elem.nextSibling.querySelectorAll(".arg")[0].focus();
+                    }
+                } catch (e) {
+                    // do nothing, just don't throw an error
+                }
+                break;
+            case "KeyB": // Set breakpoint
+                e.preventDefault();
+                try {
+                    elem = document.activeElement.closest(".operation").querySelectorAll(".breakpoint")[0];
+                    if (elem.getAttribute("break") === "false") {
+                        elem.setAttribute("break", "true"); // add break point if not already enabled
+                        elem.classList.add("breakpoint-selected");
+                    } else {
+                        elem.setAttribute("break", "false"); // remove break point if already enabled
+                        elem.classList.remove("breakpoint-selected");
+                    }
+                    window.dispatchEvent(this.manager.statechange);
+                } catch (e) {
+                    // do nothing, just don't throw an error
+                }
+                break;
+            case "KeyD": // Disable operation
+                e.preventDefault();
+                try {
+                    elem = document.activeElement.closest(".operation").querySelectorAll(".disable-icon")[0];
+                    if (elem.getAttribute("disabled") === "false") {
+                        elem.setAttribute("disabled", "true"); // disable operation if enabled
+                        elem.classList.add("disable-elem-selected");
+                        elem.parentNode.parentNode.classList.add("disabled");
+                    } else {
+                        elem.setAttribute("disabled", "false"); // enable operation if disabled
+                        elem.classList.remove("disable-elem-selected");
+                        elem.parentNode.parentNode.classList.remove("disabled");
+                    }
+                    this.app.progress = 0;
+                    window.dispatchEvent(this.manager.statechange);
+                } catch (e) {
+                    // do nothing, just don't throw an error
+                }
+                break;
+            case "Space": // Bake
+                e.preventDefault();
+                this.app.bake();
+                break;
+            case "Quote": // Step through
+                e.preventDefault();
+                this.app.bake(true);
+                break;
+            case "KeyC": // Clear recipe
+                e.preventDefault();
+                this.manager.recipe.clearRecipe();
+                break;
+            case "KeyS": // Save output to file
+                e.preventDefault();
+                this.manager.output.saveClick();
+                break;
+            case "KeyL": // Load recipe
+                e.preventDefault();
+                this.manager.controls.loadClick();
+                break;
+            case "KeyM": // Switch input and output
+                e.preventDefault();
+                this.manager.output.switchClick();
+                break;
+            default:
+                if (e.code.match(/Digit[0-9]/g)) { // Select nth operation
+                    e.preventDefault();
+                    try {
+                        // Select the first argument of the operation corresponding to the number pressed
+                        document.querySelector(`li:nth-child(${e.code.substr(-1)}) .arg`).focus();
+                    } catch (e) {
+                        // do nothing, just don't throw an error
+                    }
+                }
+                break;
+        }
+    }
+};
+
+
+/**
+ * Updates keybinding list when metaKey option is toggled
+ *
+ */
+BindingsWaiter.prototype.updateKeybList = function() {
+    let modWinLin = "Alt";
+    let modMac = "Opt";
+    if (this.app.options.useMetaKey) {
+        modWinLin = "Win";
+        modMac = "Cmd";
+    }
+    document.getElementById("keybList").innerHTML = `
+    <tr>
+        <td><b>Command</b></td>
+        <td><b>Shortcut (Win/Linux)</b></td>
+        <td><b>Shortcut (Mac)</b></td>
+    </tr>
+    <tr>
+        <td>Place cursor in search field</td>
+        <td>Ctrl+${modWinLin}+f</td>
+        <td>Ctrl+${modMac}+f</td>
+    <tr>
+        <td>Place cursor in input box</td>
+        <td>Ctrl+${modWinLin}+i</td>
+        <td>Ctrl+${modMac}+i</td>
+    </tr>
+    <tr>
+        <td>Place cursor in output box</td>
+        <td>Ctrl+${modWinLin}+o</td>
+        <td>Ctrl+${modMac}+o</td>
+    </tr>
+    <tr>
+        <td>Place cursor in first argument field of the next operation in the recipe</td>
+        <td>Ctrl+${modWinLin}+.</td>
+        <td>Ctrl+${modMac}+.</td>
+    </tr>
+    <tr>
+        <td>Place cursor in first argument field of the nth operation in the recipe</td>
+        <td>Ctrl+${modWinLin}+[1-9]</td>
+        <td>Ctrl+${modMac}+[1-9]</td>
+    </tr>
+    <tr>
+        <td>Disable current operation</td>
+        <td>Ctrl+${modWinLin}+d</td>
+        <td>Ctrl+${modMac}+d</td>
+    </tr>
+    <tr>
+        <td>Set/clear breakpoint</td>
+        <td>Ctrl+${modWinLin}+b</td>
+        <td>Ctrl+${modMac}+b</td>
+    </tr>
+    <tr>
+        <td>Bake</td>
+        <td>Ctrl+${modWinLin}+Space</td>
+        <td>Ctrl+${modMac}+Space</td>
+    </tr>
+    <tr>
+        <td>Step</td>
+        <td>Ctrl+${modWinLin}+'</td>
+        <td>Ctrl+${modMac}+'</td>
+    </tr>
+    <tr>
+        <td>Clear recipe</td>
+        <td>Ctrl+${modWinLin}+c</td>
+        <td>Ctrl+${modMac}+c</td>
+    </tr>
+    <tr>
+        <td>Save to file</td>
+        <td>Ctrl+${modWinLin}+s</td>
+        <td>Ctrl+${modMac}+s</td>
+    </tr>
+    <tr>
+        <td>Load recipe</td>
+        <td>Ctrl+${modWinLin}+l</td>
+        <td>Ctrl+${modMac}+l</td>
+    </tr>
+    <tr>
+        <td>Move output to input</td>
+        <td>Ctrl+${modWinLin}+m</td>
+        <td>Ctrl+${modMac}+m</td>
+    </tr>
+    `;
+};
+
+export default BindingsWaiter;
--- a/src/web/HighlighterWaiter.js
+++ b/src/web/HighlighterWaiter.js
@@ -1,6 +1,3 @@
-import Utils from "../core/Utils.js";
-
-
 /**
 * Waiter to handle events related to highlighting in CyberChef.
 *
@@ -312,9 +309,9 @@ HighlighterWaiter.prototype.outputHtmlMousemove = function(e) {
 HighlighterWaiter.prototype.selectionInfo = function(start, end) {
    const len = end.toString().length;
    const width = len < 2 ? 2 : len;
-    const startStr = Utils.pad(start.toString(), width, " ").replace(/ /g, "&nbsp;");
-    const endStr   = Utils.pad(end.toString(), width, " ").replace(/ /g, "&nbsp;");
-    const lenStr   = Utils.pad((end-start).toString(), width, " ").replace(/ /g, "&nbsp;");
+    const startStr = start.toString().padStart(width, " ").replace(/ /g, "&nbsp;");
+    const endStr = end.toString().padStart(width, " ").replace(/ /g, "&nbsp;");
+    const lenStr = (end-start).toString().padStart(width, " ").replace(/ /g, "&nbsp;");

    return "start: " + startStr + "<br>end: " + endStr + "<br>length: " + lenStr;
 };
@@ -402,7 +399,7 @@ HighlighterWaiter.prototype.highlight = function(textarea, highlighter, pos) {

    // Check if there is a carriage return in the output dish as this will not
    // be displayed by the HTML textarea and will mess up highlighting offsets.
-    if (!this.app.dishStr || this.app.dishStr.indexOf("\r") >= 0) return false;
+    if (this.manager.output.containsCR()) return false;

    const startPlaceholder = "[startHighlight]";
    const startPlaceholderRegex = /\[startHighlight\]/g;
--- a/src/web/InputWaiter.js
+++ b/src/web/InputWaiter.js
@@ -1,4 +1,4 @@
-import Utils from "../core/Utils.js";
+import LoaderWorker from "worker-loader?inline&fallback=false!./LoaderWorker.js";


 /**
@@ -33,6 +33,9 @@ const InputWaiter = function(app, manager) {
        144, //Num
        145, //Scroll
    ];
+
+    this.loaderWorker = null;
+    this.fileBuffer = null;
 };


@@ -42,20 +45,47 @@ const InputWaiter = function(app, manager) {
 * @returns {string}
 */
 InputWaiter.prototype.get = function() {
-    return document.getElementById("input-text").value;
+    return this.fileBuffer || document.getElementById("input-text").value;
 };


 /**
- * Sets the input in the input textarea.
+ * Sets the input in the input area.
 *
- * @param {string} input
+ * @param {string|File} input
 *
 * @fires Manager#statechange
 */
 InputWaiter.prototype.set = function(input) {
-    document.getElementById("input-text").value = input;
-    window.dispatchEvent(this.manager.statechange);
+    const inputText = document.getElementById("input-text");
+    if (input instanceof File) {
+        this.setFile(input);
+        inputText.value = "";
+    } else {
+        inputText.value = input;
+        window.dispatchEvent(this.manager.statechange);
+    }
+};
+
+
+/**
+ * Shows file details.
+ *
+ * @param {File} file
+ */
+InputWaiter.prototype.setFile = function(file) {
+    // Display file overlay in input area with details
+    const fileOverlay = document.getElementById("input-file"),
+        fileName = document.getElementById("input-file-name"),
+        fileSize = document.getElementById("input-file-size"),
+        fileType = document.getElementById("input-file-type"),
+        fileLoaded = document.getElementById("input-file-loaded");
+
+    fileOverlay.style.display = "block";
+    fileName.textContent = file.name;
+    fileSize.textContent = file.size.toLocaleString() + " bytes";
+    fileType.textContent = file.type || "unknown";
+    fileLoaded.textContent = "0%";
 };


@@ -69,8 +99,8 @@ InputWaiter.prototype.setInputInfo = function(length, lines) {
    let width = length.toString().length;
    width = width < 2 ? 2 : width;

-    const lengthStr = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
-    const linesStr  = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
+    const lengthStr = length.toString().padStart(width, " ").replace(/ /g, "&nbsp;");
+    const linesStr = lines.toString().padStart(width, " ").replace(/ /g, "&nbsp;");

    document.getElementById("input-info").innerHTML = "length: " + lengthStr + "<br>lines: " + linesStr;
 };
@@ -118,7 +148,7 @@ InputWaiter.prototype.inputDragover = function(e) {

    e.stopPropagation();
    e.preventDefault();
-    e.target.classList.add("dropping-file");
+    e.target.closest("#input-text,#input-file").classList.add("dropping-file");
 };


@@ -131,7 +161,8 @@ InputWaiter.prototype.inputDragover = function(e) {
 InputWaiter.prototype.inputDragleave = function(e) {
    e.stopPropagation();
    e.preventDefault();
-    e.target.classList.remove("dropping-file");
+    document.getElementById("input-text").classList.remove("dropping-file");
+    document.getElementById("input-file").classList.remove("dropping-file");
 };


@@ -149,55 +180,58 @@ InputWaiter.prototype.inputDrop = function(e) {
    e.stopPropagation();
    e.preventDefault();

-    const el = e.target;
    const file = e.dataTransfer.files[0];
    const text = e.dataTransfer.getData("Text");
-    const reader = new FileReader();
-    let inputCharcode = "";
-    let offset = 0;
-    const CHUNK_SIZE = 20480; // 20KB

-    const setInput = function() {
-        const recipeConfig = this.app.getRecipeConfig();
-        if (!recipeConfig[0] || recipeConfig[0].op !== "From Hex") {
-            recipeConfig.unshift({op: "From Hex", args: ["Space"]});
-            this.app.setRecipeConfig(recipeConfig);
-        }
+    document.getElementById("input-text").classList.remove("dropping-file");
+    document.getElementById("input-file").classList.remove("dropping-file");

-        this.set(inputCharcode);
-
-        el.classList.remove("loadingFile");
-    }.bind(this);
-
-    const seek = function() {
-        if (offset >= file.size) {
-            setInput();
-            return;
-        }
-        el.value = "Processing... " + Math.round(offset / file.size * 100) + "%";
-        const slice = file.slice(offset, offset + CHUNK_SIZE);
-        reader.readAsArrayBuffer(slice);
-    };
-
-    reader.onload = function(e) {
-        const data = new Uint8Array(reader.result);
-        inputCharcode += Utils.toHexFast(data);
-        offset += CHUNK_SIZE;
-        seek();
-    };
-
-
-    el.classList.remove("dropping-file");
+    if (text) {
+        this.closeFile();
+        this.set(text);
+        return;
+    }

    if (file) {
-        el.classList.add("loadingFile");
-        seek();
-    } else if (text) {
-        this.set(text);
+        this.closeFile();
+        this.loaderWorker = new LoaderWorker();
+        this.loaderWorker.addEventListener("message", this.handleLoaderMessage.bind(this));
+        this.loaderWorker.postMessage({"file": file});
+        this.set(file);
    }
 };


+/**
+ * Handler for messages sent back by the LoaderWorker.
+ *
+ * @param {MessageEvent} e
+ */
+InputWaiter.prototype.handleLoaderMessage = function(e) {
+    const r = e.data;
+    if (r.hasOwnProperty("progress")) {
+        const fileLoaded = document.getElementById("input-file-loaded");
+        fileLoaded.textContent = r.progress + "%";
+    }
+
+    if (r.hasOwnProperty("fileBuffer")) {
+        log.debug("Input file loaded");
+        this.fileBuffer = r.fileBuffer;
+        window.dispatchEvent(this.manager.statechange);
+    }
+};
+
+
+/**
+ * Handler for file close events.
+ */
+InputWaiter.prototype.closeFile = function() {
+    if (this.loaderWorker) this.loaderWorker.terminate();
+    this.fileBuffer = null;
+    document.getElementById("input-file").style.display = "none";
+};
+
+
 /**
 * Handler for clear IO events.
 * Resets the input, output and info areas.
@@ -205,6 +239,8 @@ InputWaiter.prototype.inputDrop = function(e) {
 * @fires Manager#statechange
 */
 InputWaiter.prototype.clearIoClick = function() {
+    this.closeFile();
+    this.manager.output.closeFile();
    this.manager.highlighter.removeHighlights();
    document.getElementById("input-text").value = "";
    document.getElementById("output-text").value = "";
--- a/src/web/LoaderWorker.js
+++ b/src/web/LoaderWorker.js
@@ -0,0 +1,50 @@
+/**
+ * Web Worker to load large amounts of data without locking up the UI.
+ *
+ * @author n1474335 [n1474335@gmail.com]
+ * @copyright Crown Copyright 2017
+ * @license Apache-2.0
+ */
+
+
+/**
+ * Respond to message from parent thread.
+ */
+self.addEventListener("message", function(e) {
+    const r = e.data;
+    if (r.hasOwnProperty("file")) {
+        self.loadFile(r.file);
+    }
+});
+
+
+/**
+ * Loads a file object into an ArrayBuffer, then transfers it back to the parent thread.
+ * 
+ * @param {File} file
+ */
+self.loadFile = function(file) {
+    const reader = new FileReader();
+    let data = new Uint8Array(file.size);
+    let offset = 0;
+    const CHUNK_SIZE = 10485760; // 10MiB
+
+    const seek = function() {
+        if (offset >= file.size) {
+            self.postMessage({"progress": 100});
+            self.postMessage({"fileBuffer": data.buffer}, [data.buffer]);
+            return;
+        }
+        self.postMessage({"progress": Math.round(offset / file.size * 100)});
+        const slice = file.slice(offset, offset + CHUNK_SIZE);
+        reader.readAsArrayBuffer(slice);
+    };
+
+    reader.onload = function(e) {
+        data.set(new Uint8Array(reader.result), offset);
+        offset += CHUNK_SIZE;
+        seek();
+    };
+
+    seek();
+};
--- a/src/web/Manager.js
+++ b/src/web/Manager.js
@@ -8,6 +8,7 @@ import OutputWaiter from "./OutputWaiter.js";
 import OptionsWaiter from "./OptionsWaiter.js";
 import HighlighterWaiter from "./HighlighterWaiter.js";
 import SeasonalWaiter from "./SeasonalWaiter.js";
+import BindingsWaiter from "./BindingsWaiter.js";


 /**
@@ -57,9 +58,10 @@ const Manager = function(app) {
    this.ops         = new OperationsWaiter(this.app, this);
    this.input       = new InputWaiter(this.app, this);
    this.output      = new OutputWaiter(this.app, this);
-    this.options     = new OptionsWaiter(this.app);
+    this.options     = new OptionsWaiter(this.app, this);
    this.highlighter = new HighlighterWaiter(this.app, this);
    this.seasonal    = new SeasonalWaiter(this.app, this);
+    this.bindings    = new BindingsWaiter(this.app, this);

    // Object to store dynamic handlers to fire on elements that may not exist yet
    this.dynamicHandlers = {};
@@ -75,6 +77,7 @@ Manager.prototype.setup = function() {
    this.worker.registerChefWorker();
    this.recipe.initialiseOperationDragNDrop();
    this.controls.autoBakeChange();
+    this.bindings.updateKeybList();
    this.seasonal.load();
 };

@@ -116,7 +119,7 @@ Manager.prototype.initialiseEventListeners = function() {
    this.addDynamicListener(".op-list .op-icon", "mouseover", this.ops.opIconMouseover, this.ops);
    this.addDynamicListener(".op-list .op-icon", "mouseleave", this.ops.opIconMouseleave, this.ops);
    this.addDynamicListener(".op-list", "oplistcreate", this.ops.opListCreate, this.ops);
-    this.addDynamicListener("li.operation", "operationadd", this.recipe.opAdd.bind(this.recipe));
+    this.addDynamicListener("li.operation", "operationadd", this.recipe.opAdd, this.recipe);

    // Recipe
    this.addDynamicListener(".arg:not(select)", "input", this.recipe.ingChange, this.recipe);
@@ -132,16 +135,18 @@ Manager.prototype.initialiseEventListeners = function() {
    this.addMultiEventListener("#input-text", "keyup paste", this.input.inputChange, this.input);
    document.getElementById("reset-layout").addEventListener("click", this.app.resetLayout.bind(this.app));
    document.getElementById("clr-io").addEventListener("click", this.input.clearIoClick.bind(this.input));
-    document.getElementById("input-text").addEventListener("dragover", this.input.inputDragover.bind(this.input));
-    document.getElementById("input-text").addEventListener("dragleave", this.input.inputDragleave.bind(this.input));
-    document.getElementById("input-text").addEventListener("drop", this.input.inputDrop.bind(this.input));
+    this.addListeners("#input-text,#input-file", "dragover", this.input.inputDragover, this.input);
+    this.addListeners("#input-text,#input-file", "dragleave", this.input.inputDragleave, this.input);
+    this.addListeners("#input-text,#input-file", "drop", this.input.inputDrop, this.input);
    document.getElementById("input-text").addEventListener("scroll", this.highlighter.inputScroll.bind(this.highlighter));
    document.getElementById("input-text").addEventListener("mouseup", this.highlighter.inputMouseup.bind(this.highlighter));
    document.getElementById("input-text").addEventListener("mousemove", this.highlighter.inputMousemove.bind(this.highlighter));
    this.addMultiEventListener("#input-text", "mousedown dblclick select",  this.highlighter.inputMousedown, this.highlighter);
+    document.querySelector("#input-file .close").addEventListener("click", this.input.clearIoClick.bind(this.input));

    // Output
    document.getElementById("save-to-file").addEventListener("click", this.output.saveClick.bind(this.output));
+    document.getElementById("copy-output").addEventListener("click", this.output.copyClick.bind(this.output));
    document.getElementById("switch").addEventListener("click", this.output.switchClick.bind(this.output));
    document.getElementById("undo-switch").addEventListener("click", this.output.undoSwitchClick.bind(this.output));
    document.getElementById("maximise-output").addEventListener("click", this.output.maximiseOutputClick.bind(this.output));
@@ -153,18 +158,24 @@ Manager.prototype.initialiseEventListeners = function() {
    this.addMultiEventListener("#output-text", "mousedown dblclick select",  this.highlighter.outputMousedown, this.highlighter);
    this.addMultiEventListener("#output-html", "mousedown dblclick select",  this.highlighter.outputHtmlMousedown, this.highlighter);
    this.addDynamicListener(".file-switch", "click", this.output.fileSwitch, this.output);
+    this.addDynamicListener("#output-file-download", "click", this.output.downloadFile, this.output);
+    this.addDynamicListener("#output-file-slice", "click", this.output.displayFileSlice, this.output);
+    document.getElementById("show-file-overlay").addEventListener("click", this.output.showFileOverlayClick.bind(this.output));

    // Options
    document.getElementById("options").addEventListener("click", this.options.optionsClick.bind(this.options));
    document.getElementById("reset-options").addEventListener("click", this.options.resetOptionsClick.bind(this.options));
    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox", this.options.switchChange.bind(this.options));
    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox", this.options.setWordWrap.bind(this.options));
+    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox#useMetaKey", this.bindings.updateKeybList.bind(this.bindings));
    this.addDynamicListener(".option-item input[type=number]", "keyup", this.options.numberChange, this.options);
    this.addDynamicListener(".option-item input[type=number]", "change", this.options.numberChange, this.options);
    this.addDynamicListener(".option-item select", "change", this.options.selectChange, this.options);
    document.getElementById("theme").addEventListener("change", this.options.themeChange.bind(this.options));
+    document.getElementById("logLevel").addEventListener("change", this.options.logLevelChange.bind(this.options));

    // Misc
+    window.addEventListener("keydown", this.bindings.parseInput.bind(this.bindings));
    document.getElementById("alert-close").addEventListener("click", this.app.alertCloseClick.bind(this.app));
 };

--- a/src/web/OptionsWaiter.js
+++ b/src/web/OptionsWaiter.js
@@ -8,8 +8,9 @@
 * @constructor
 * @param {App} app - The main view object for CyberChef.
 */
-const OptionsWaiter = function(app) {
+const OptionsWaiter = function(app, manager) {
    this.app = app;
+    this.manager = manager;
 };


@@ -86,6 +87,7 @@ OptionsWaiter.prototype.switchChange = function(e, state) {
    const el = e.target;
    const option = el.getAttribute("option");

+    log.debug(`Setting ${option} to ${state}`);
    this.app.options[option] = state;

    if (this.app.isLocalStorageAvailable())
@@ -102,8 +104,10 @@ OptionsWaiter.prototype.switchChange = function(e, state) {
 OptionsWaiter.prototype.numberChange = function(e) {
    const el = e.target;
    const option = el.getAttribute("option");
+    const val = parseInt(el.value, 10);

-    this.app.options[option] = parseInt(el.value, 10);
+    log.debug(`Setting ${option} to ${val}`);
+    this.app.options[option] = val;

    if (this.app.isLocalStorageAvailable())
        localStorage.setItem("options", JSON.stringify(this.app.options));
@@ -120,6 +124,7 @@ OptionsWaiter.prototype.selectChange = function(e) {
    const el = e.target;
    const option = el.getAttribute("option");

+    log.debug(`Setting ${option} to ${el.value}`);
    this.app.options[option] = el.value;

    if (this.app.isLocalStorageAvailable())
@@ -149,6 +154,8 @@ OptionsWaiter.prototype.setWordWrap = function() {

 /**
 * Changes the theme by setting the class of the <html> element.
+ * 
+ * @param {Event} e
 */
 OptionsWaiter.prototype.themeChange = function (e) {
    const themeClass = e.target.value;
@@ -156,4 +163,16 @@ OptionsWaiter.prototype.themeChange = function (e) {
    document.querySelector(":root").className = themeClass;
 };

+
+/**
+ * Changes the console logging level.
+ * 
+ * @param {Event} e
+ */
+OptionsWaiter.prototype.logLevelChange = function (e) {
+    const level = e.target.value;
+    log.setLevel(level, false);
+    this.manager.worker.setLogLevel();
+};
+
 export default OptionsWaiter;
--- a/src/web/OutputWaiter.js
+++ b/src/web/OutputWaiter.js
@@ -1,4 +1,5 @@
 import Utils from "../core/Utils.js";
+import FileSaver from "file-saver";


 /**
@@ -15,6 +16,9 @@ import Utils from "../core/Utils.js";
 const OutputWaiter = function(app, manager) {
    this.app = app;
    this.manager = manager;
+
+    this.dishBuffer = null;
+    this.dishStr = null;
 };


@@ -31,47 +35,151 @@ OutputWaiter.prototype.get = function() {
 /**
 * Sets the output in the output textarea.
 *
- * @param {string} dataStr - The output string/HTML
+ * @param {string|ArrayBuffer} data - The output string/HTML/ArrayBuffer
 * @param {string} type - The data type of the output
 * @param {number} duration - The length of time (ms) it took to generate the output
+ * @param {boolean} [preserveBuffer=false] - Whether to preserve the dishBuffer
 */
-OutputWaiter.prototype.set = function(dataStr, type, duration) {
+OutputWaiter.prototype.set = function(data, type, duration, preserveBuffer) {
+    log.debug("Output type: " + type);
    const outputText = document.getElementById("output-text");
    const outputHtml = document.getElementById("output-html");
+    const outputFile = document.getElementById("output-file");
    const outputHighlighter = document.getElementById("output-highlighter");
    const inputHighlighter = document.getElementById("input-highlighter");
+    let scriptElements, lines, length;

-    if (type === "html") {
-        outputText.style.display = "none";
-        outputHtml.style.display = "block";
-        outputHighlighter.display = "none";
-        inputHighlighter.display = "none";
+    if (!preserveBuffer) {
+        this.closeFile();
+        document.getElementById("show-file-overlay").style.display = "none";
+    }

-        outputText.value = "";
-        outputHtml.innerHTML = dataStr;
+    switch (type) {
+        case "html":
+            outputText.style.display = "none";
+            outputHtml.style.display = "block";
+            outputFile.style.display = "none";
+            outputHighlighter.display = "none";
+            inputHighlighter.display = "none";

-        // Execute script sections
-        const scriptElements = outputHtml.querySelectorAll("script");
-        for (let i = 0; i < scriptElements.length; i++) {
-            try {
-                eval(scriptElements[i].innerHTML); // eslint-disable-line no-eval
-            } catch (err) {
-                console.error(err);
+            outputText.value = "";
+            outputHtml.innerHTML = data;
+            this.dishStr = Utils.stripHtmlTags(data, true);
+            length = data.length;
+            lines = this.dishStr.count("\n") + 1;
+
+            // Execute script sections
+            scriptElements = outputHtml.querySelectorAll("script");
+            for (let i = 0; i < scriptElements.length; i++) {
+                try {
+                    eval(scriptElements[i].innerHTML); // eslint-disable-line no-eval
+                } catch (err) {
+                    log.error(err);
+                }
            }
-        }
-    } else {
-        outputText.style.display = "block";
-        outputHtml.style.display = "none";
-        outputHighlighter.display = "block";
-        inputHighlighter.display = "block";
+            break;
+        case "ArrayBuffer":
+            outputText.style.display = "block";
+            outputHtml.style.display = "none";
+            outputHighlighter.display = "none";
+            inputHighlighter.display = "none";

-        outputText.value = Utils.printable(dataStr, true);
-        outputHtml.innerHTML = "";
+            outputText.value = "";
+            outputHtml.innerHTML = "";
+            this.dishStr = "";
+            length = data.byteLength;
+
+            this.setFile(data);
+            break;
+        case "string":
+        default:
+            outputText.style.display = "block";
+            outputHtml.style.display = "none";
+            outputFile.style.display = "none";
+            outputHighlighter.display = "block";
+            inputHighlighter.display = "block";
+
+            outputText.value = Utils.printable(data, true);
+            outputHtml.innerHTML = "";
+
+            lines = data.count("\n") + 1;
+            length = data.length;
+            this.dishStr = data;
+            break;
    }

    this.manager.highlighter.removeHighlights();
-    const lines = dataStr.count("\n") + 1;
-    this.setOutputInfo(dataStr.length, lines, duration);
+    this.setOutputInfo(length, lines, duration);
+};
+
+
+/**
+ * Shows file details.
+ *
+ * @param {ArrayBuffer} buf
+ */
+OutputWaiter.prototype.setFile = function(buf) {
+    this.dishBuffer = buf;
+    const file = new File([buf], "output.dat");
+
+    // Display file overlay in output area with details
+    const fileOverlay = document.getElementById("output-file"),
+        fileSize = document.getElementById("output-file-size");
+
+    fileOverlay.style.display = "block";
+    fileSize.textContent = file.size.toLocaleString() + " bytes";
+};
+
+
+/**
+ * Removes the output file and nulls its memory.
+ */
+OutputWaiter.prototype.closeFile = function() {
+    this.dishBuffer = null;
+    document.getElementById("output-file").style.display = "none";
+};
+
+
+/**
+ * Handler for file download events.
+ */
+OutputWaiter.prototype.downloadFile = function() {
+    this.filename = window.prompt("Please enter a filename:", this.filename || "download.dat");
+    const file = new File([this.dishBuffer], this.filename);
+
+    if (this.filename) FileSaver.saveAs(file, this.filename, false);
+};
+
+
+/**
+ * Handler for file slice display events.
+ */
+OutputWaiter.prototype.displayFileSlice = function() {
+    const startTime = new Date().getTime(),
+        showFileOverlay = document.getElementById("show-file-overlay"),
+        sliceFromEl = document.getElementById("output-file-slice-from"),
+        sliceToEl = document.getElementById("output-file-slice-to"),
+        sliceFrom = parseInt(sliceFromEl.value, 10),
+        sliceTo = parseInt(sliceToEl.value, 10),
+        str = Utils.arrayBufferToStr(this.dishBuffer.slice(sliceFrom, sliceTo));
+
+    showFileOverlay.style.display = "block";
+    this.set(str, "string", new Date().getTime() - startTime, true);
+};
+
+
+/**
+ * Handler for show file overlay events.
+ * 
+ * @param {Event} e
+ */
+OutputWaiter.prototype.showFileOverlayClick = function(e) {
+    const outputFile = document.getElementById("output-file"),
+        showFileOverlay = e.target;
+
+    outputFile.style.display = "block";
+    showFileOverlay.style.display = "none";
+    this.setOutputInfo(this.dishBuffer.byteLength, null, 0);
 };


@@ -86,13 +194,17 @@ OutputWaiter.prototype.setOutputInfo = function(length, lines, duration) {
    let width = length.toString().length;
    width = width < 4 ? 4 : width;

-    const lengthStr = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
-    const linesStr  = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
-    const timeStr   = Utils.pad(duration.toString() + "ms", width, " ").replace(/ /g, "&nbsp;");
+    const lengthStr = length.toString().padStart(width, " ").replace(/ /g, "&nbsp;");
+    const timeStr = (duration.toString() + "ms").padStart(width, " ").replace(/ /g, "&nbsp;");

-    document.getElementById("output-info").innerHTML = "time: " + timeStr +
-        "<br>length: " + lengthStr +
-        "<br>lines: " + linesStr;
+    let msg = "time: " + timeStr + "<br>length: " + lengthStr;
+
+    if (typeof lines === "number") {
+        const linesStr = lines.toString().padStart(width, " ").replace(/ /g, "&nbsp;");
+        msg += "<br>lines: " + linesStr;
+    }
+
+    document.getElementById("output-info").innerHTML = msg;
    document.getElementById("input-selection-info").innerHTML = "";
    document.getElementById("output-selection-info").innerHTML = "";
 };
@@ -105,17 +217,20 @@ OutputWaiter.prototype.setOutputInfo = function(length, lines, duration) {
 OutputWaiter.prototype.adjustWidth = function() {
    const output         = document.getElementById("output");
    const saveToFile     = document.getElementById("save-to-file");
+    const copyOutput     = document.getElementById("copy-output");
    const switchIO       = document.getElementById("switch");
    const undoSwitch     = document.getElementById("undo-switch");
    const maximiseOutput = document.getElementById("maximise-output");

    if (output.clientWidth < 680) {
        saveToFile.childNodes[1].nodeValue = "";
+        copyOutput.childNodes[1].nodeValue = "";
        switchIO.childNodes[1].nodeValue = "";
        undoSwitch.childNodes[1].nodeValue = "";
        maximiseOutput.childNodes[1].nodeValue = "";
    } else {
        saveToFile.childNodes[1].nodeValue = " Save to file";
+        copyOutput.childNodes[1].nodeValue = " Copy output";
        switchIO.childNodes[1].nodeValue = " Move output to input";
        undoSwitch.childNodes[1].nodeValue = " Undo";
        maximiseOutput.childNodes[1].nodeValue =
@@ -126,24 +241,51 @@ OutputWaiter.prototype.adjustWidth = function() {

 /**
 * Handler for save click events.
- * Saves the current output to a file, downloaded as a URL octet stream.
+ * Saves the current output to a file.
 */
 OutputWaiter.prototype.saveClick = function() {
-    const data = Utils.toBase64(this.app.dishStr);
-    const filename = window.prompt("Please enter a filename:", "download.dat");
-
-    if (filename) {
-        const el = document.createElement("a");
-        el.setAttribute("href", "data:application/octet-stream;base64;charset=utf-8," + data);
-        el.setAttribute("download", filename);
-
-        // Firefox requires that the element be added to the DOM before it can be clicked
-        el.style.display = "none";
-        document.body.appendChild(el);
-
-        el.click();
-        el.remove();
+    if (!this.dishBuffer) {
+        this.dishBuffer = new Uint8Array(Utils.strToCharcode(this.dishStr)).buffer;
    }
+    this.downloadFile();
+};
+
+
+/**
+ * Handler for copy click events.
+ * Copies the output to the clipboard.
+ */
+OutputWaiter.prototype.copyClick = function() {
+    // Create invisible textarea to populate with the raw dishStr (not the printable version that
+    // contains dots instead of the actual bytes)
+    const textarea = document.createElement("textarea");
+    textarea.style.position = "fixed";
+    textarea.style.top = 0;
+    textarea.style.left = 0;
+    textarea.style.width = 0;
+    textarea.style.height = 0;
+    textarea.style.border = "none";
+
+    textarea.value = this.dishStr;
+    document.body.appendChild(textarea);
+
+    // Select and copy the contents of this textarea
+    let success = false;
+    try {
+        textarea.select();
+        success = this.dishStr && document.execCommand("copy");
+    } catch (err) {
+        success = false;
+    }
+
+    if (success) {
+        this.app.alert("Copied raw output successfully.", "success", 2000);
+    } else {
+        this.app.alert("Sorry, the output could not be copied.", "danger", 2000);
+    }
+
+    // Clean up
+    document.body.removeChild(textarea);
 };


@@ -154,7 +296,17 @@ OutputWaiter.prototype.saveClick = function() {
 OutputWaiter.prototype.switchClick = function() {
    this.switchOrigData = this.manager.input.get();
    document.getElementById("undo-switch").disabled = false;
-    this.app.setInput(this.app.dishStr);
+    if (this.dishBuffer) {
+        this.manager.input.setFile(new File([this.dishBuffer], "output.dat"));
+        this.manager.input.handleLoaderMessage({
+            data: {
+                progress: 100,
+                fileBuffer: this.dishBuffer
+            }
+        });
+    } else {
+        this.app.setInput(this.dishStr);
+    }
 };


@@ -169,7 +321,7 @@ OutputWaiter.prototype.undoSwitchClick = function() {

 /**
 * Handler for file switch click events.
- * Moves a files data for items created via Utils.displayFilesAsHTML to the input.
+ * Moves a file's data for items created via Utils.displayFilesAsHTML to the input.
 */
 OutputWaiter.prototype.fileSwitch = function(e) {
    e.preventDefault();
@@ -241,4 +393,14 @@ OutputWaiter.prototype.setStatusMsg = function(msg) {
    el.textContent = msg;
 };

+
+/**
+ * Returns true if the output contains carriage returns
+ *
+ * @returns {boolean}
+ */
+OutputWaiter.prototype.containsCR = function() {
+    return this.dishStr.indexOf("\r") >= 0;
+};
+
 export default OutputWaiter;
--- a/src/web/RecipeWaiter.js
+++ b/src/web/RecipeWaiter.js
@@ -253,7 +253,7 @@ RecipeWaiter.prototype.breakpointClick = function(e) {
 */
 RecipeWaiter.prototype.operationDblclick = function(e) {
    e.target.remove();
-    window.dispatchEvent(this.manager.statechange);
+    this.opRemove(e);
 };


@@ -266,7 +266,7 @@ RecipeWaiter.prototype.operationDblclick = function(e) {
 */
 RecipeWaiter.prototype.operationChildDblclick = function(e) {
    e.target.parentNode.remove();
-    window.dispatchEvent(this.manager.statechange);
+    this.opRemove(e);
 };


@@ -421,6 +421,7 @@ RecipeWaiter.prototype.dropdownToggleClick = function(e) {
 * @param {event} e
 */
 RecipeWaiter.prototype.opAdd = function(e) {
+    log.debug(`'${e.target.querySelector(".arg-title").textContent}' added to recipe`);
    window.dispatchEvent(this.manager.statechange);
 };

@@ -433,6 +434,7 @@ RecipeWaiter.prototype.opAdd = function(e) {
 * @param {event} e
 */
 RecipeWaiter.prototype.opRemove = function(e) {
+    log.debug("Operation removed from recipe");
    window.dispatchEvent(this.manager.statechange);
 };

--- a/src/web/WorkerWaiter.js
+++ b/src/web/WorkerWaiter.js
@@ -1,4 +1,3 @@
-import Utils from "../core/Utils.js";
 import ChefWorker from "worker-loader?inline&fallback=false!../core/ChefWorker.js";

 /**
@@ -22,8 +21,10 @@ const WorkerWaiter = function(app, manager) {
 * Sets up the ChefWorker and associated listeners.
 */
 WorkerWaiter.prototype.registerChefWorker = function() {
+    log.debug("Registering new ChefWorker");
    this.chefWorker = new ChefWorker();
    this.chefWorker.addEventListener("message", this.handleChefMessage.bind(this));
+    this.setLogLevel();

    let docURL = document.location.href.split(/[#?]/)[0];
    const index = docURL.lastIndexOf("/");
@@ -41,8 +42,10 @@ WorkerWaiter.prototype.registerChefWorker = function() {
 */
 WorkerWaiter.prototype.handleChefMessage = function(e) {
    const r = e.data;
+    log.debug("Receiving '" + r.action + "' from ChefWorker");
+
    switch (r.action) {
-        case "bakeSuccess":
+        case "bakeComplete":
            this.bakingComplete(r.data);
            break;
        case "bakeError":
@@ -53,12 +56,14 @@ WorkerWaiter.prototype.handleChefMessage = function(e) {
            break;
        case "workerLoaded":
            this.app.workerLoaded = true;
+            log.debug("ChefWorker loaded");
            this.app.loaded();
            break;
        case "statusMessage":
            this.manager.output.setStatusMsg(r.data);
            break;
        case "optionUpdate":
+            log.debug(`Setting ${r.data.option} to ${r.data.value}`);
            this.app.options[r.data.option] = r.data.value;
            break;
        case "setRegisters":
@@ -68,7 +73,7 @@ WorkerWaiter.prototype.handleChefMessage = function(e) {
            this.manager.highlighter.displayHighlights(r.data.pos, r.data.direction);
            break;
        default:
-            console.error("Unrecognised message from ChefWorker", e);
+            log.error("Unrecognised message from ChefWorker", e);
            break;
    }
 };
@@ -111,10 +116,10 @@ WorkerWaiter.prototype.bakingComplete = function(response) {
        this.app.handleError(response.error);
    }

-    this.app.dishStr  = response.type === "html" ? Utils.stripHtmlTags(response.result, true) : response.result;
    this.app.progress = response.progress;
    this.manager.recipe.updateBreakpointIndicator(response.progress);
    this.manager.output.set(response.result, response.type, response.duration);
+    log.debug("--- Bake complete ---");
 };


@@ -147,7 +152,7 @@ WorkerWaiter.prototype.bake = function(input, recipeConfig, options, progress, s
 * Asks the ChefWorker to run a silent bake, forcing the browser to load and cache all the relevant
 * JavaScript code needed to do a real bake.
 *
- * @param {Objectp[]} [recipeConfig]
+ * @param {Object[]} [recipeConfig]
 */
 WorkerWaiter.prototype.silentBake = function(recipeConfig) {
    this.chefWorker.postMessage({
@@ -180,4 +185,19 @@ WorkerWaiter.prototype.highlight = function(recipeConfig, direction, pos) {
 };


+/**
+ * Sets the console log level in the worker.
+ *
+ * @param {string} level
+ */
+WorkerWaiter.prototype.setLogLevel = function(level) {
+    if (!this.chefWorker) return;
+
+    this.chefWorker.postMessage({
+        action: "setLogLevel",
+        data: log.getLevel()
+    });
+};
+
+
 export default WorkerWaiter;
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -1,17 +1,17 @@
 <!-- htmlmin:ignore --><!--
    CyberChef - The Cyber Swiss Army Knife
-    
+
    @copyright Crown Copyright 2016
    @license Apache-2.0
-    
+
      Copyright 2016 Crown Copyright
-    
+
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
-    
+
        http://www.apache.org/licenses/LICENSE-2.0
-    
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
    <head>
        <meta charset="UTF-8">
        <title>CyberChef</title>
-        
+
        <meta name="copyright" content="Crown Copyright 2016" />
        <meta name="description" content="The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis" />
        <meta name="keywords" content="base64, hex, decode, encode, encrypt, decrypt, compress, decompress, regex, regular expressions, hash, crypt, hexadecimal, user agent, url, certificate, x.509, parser, JSON, gzip,  md5, sha1, aes, des, blowfish, xor" />
@@ -135,11 +135,11 @@
                    <ul id="search-results" class="op-list"></ul>
                    <div id="categories" class="panel-group no-select"></div>
                </div>
-                
+
                <div id="recipe" class="split split-horizontal no-select">
                    <div class="title no-select">Recipe</div>
                    <ul id="rec-list" class="list-area no-select"></ul>
-                    
+
                    <div id="controls" class="no-select">
                        <div id="operational-controls">
                            <div id="bake-group">
@@ -152,13 +152,13 @@
                                    <div>Auto Bake</div>
                                </label>
                            </div>
-                            
+
                            <div class="btn-group" style="padding-top: 10px;">
                                <button type="button" class="btn btn-default" id="step"><img aria-hidden="true" src="<%- require('../static/images/step-16x16.png') %>" alt="Footstep Icon"/> Step through</button>
                                <button type="button" class="btn btn-default" id="clr-breaks"><img aria-hidden="true" src="<%- require('../static/images/erase-16x16.png') %>" alt="Eraser Icon"/> Clear breakpoints</button>
                            </div>
                        </div>
-                        
+
                        <div class="btn-group-vertical" id="extra-controls">
                            <button type="button" class="btn btn-default" id="save"><img aria-hidden="true" src="<%- require('../static/images/save-16x16.png') %>" alt="Save Icon"/> Save recipe</button>
                            <button type="button" class="btn btn-default" id="load"><img aria-hidden="true" src="<%- require('../static/images/open_yellow-16x16.png') %>" alt="Open Icon"/> Load recipe</button>
@@ -166,7 +166,7 @@
                        </div>
                    </div>
                </div>
-                
+
                <div class="split split-horizontal" id="IO">
                    <div id="input" class="split no-select">
                        <div class="title no-select">
@@ -181,14 +181,29 @@
                        <div class="textarea-wrapper no-select">
                            <div id="input-highlighter" class="no-select"></div>
                            <textarea id="input-text"></textarea>
+                            <div id="input-file">
+                                <div style="position: relative; height: 100%;">
+                                    <div class="card">
+                                        <img aria-hidden="true" src="<%- require('../static/images/file-128x128.png') %>" alt="File icon"/>
+                                        <div class="card-body">
+                                            <button type="button" class="close" id="input-file-close">&times;</button>
+                                            Name: <span id="input-file-name"></span><br>
+                                            Size: <span id="input-file-size"></span><br>
+                                            Type: <span id="input-file-type"></span><br>
+                                            Loaded: <span id="input-file-loaded"></span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                        </div>
                    </div>
-                    
+
                    <div id="output" class="split">
                        <div class="title no-select">
                            <label for="output-text">Output</label>
                            <div class="btn-group io-btn-group">
                                <button type="button" class="btn btn-default btn-sm" id="save-to-file" title="Save to file"><img aria-hidden="true" src="<%- require('../static/images/save_as-16x16.png') %>" alt="Save Icon"/> Save to file</button>
+                                <button type="button" class="btn btn-default btn-sm" id="copy-output" title="Copy output"><img aria-hidden="true" src="<%- require('../static/images/copy-16x16.png') %>" alt="Copy Icon"/> Copy raw output</button>
                                <button type="button" class="btn btn-default btn-sm" id="switch" title="Move output to input"><img aria-hidden="true" src="<%- require('../static/images/switch-16x16.png') %>" alt="Switch Icon"/> Move output to input</button>
                                <button type="button" class="btn btn-default btn-sm" id="undo-switch" title="Undo move" disabled="disabled"><img aria-hidden="true" src="<%- require('../static/images/undo-16x16.png') %>" alt="Undo Icon"/> Undo</button>
                                <button type="button" class="btn btn-default btn-sm" id="maximise-output" title="Maximise"><img aria-hidden="true" src="<%- require('../static/images/maximise-16x16.png') %>" alt="Maximise Icon"/> Max</button>
@@ -201,6 +216,26 @@
                            <div id="output-highlighter" class="no-select"></div>
                            <div id="output-html"></div>
                            <textarea id="output-text" readonly="readonly"></textarea>
+                            <img id="show-file-overlay" aria-hidden="true" src="<%- require('../static/images/file-32x32.png') %>" alt="Show file overlay" title="Show file overlay"/>
+                            <div id="output-file">
+                                <div style="position: relative; height: 100%;">
+                                    <div class="card">
+                                        <img aria-hidden="true" src="<%- require('../static/images/file-128x128.png') %>" alt="File icon"/>
+                                        <div class="card-body">
+                                            Size: <span id="output-file-size"></span><br>
+                                            <button id="output-file-download" type="button" class="btn btn-primary">Download</button>
+                                            <div class="input-group">
+                                                <span class="input-group-btn">
+                                                    <button id="output-file-slice" type="button" class="btn btn-default" title="View slice">&#x1f50d;</button>
+                                                </span>
+                                                <input type="number" class="form-control" id="output-file-slice-from" placeholder="From" value="0" step="1024" min="0">
+                                                <div class="input-group-addon">to</div>
+                                                <input type="number" class="form-control" id="output-file-slice-to" placeholder="To" value="1024" step="1024" min="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                            <div id="output-loader">
                                <div class="loader"></div>
                                <div class="loading-msg"></div>
@@ -210,7 +245,7 @@
                </div>
            </div>
        </div>
-        
+
        <div class="modal" id="save-modal" tabindex="-1" role="dialog">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -261,7 +296,7 @@
                </div>
            </div>
        </div>
-        
+
        <div class="modal" id="load-modal" tabindex="-1" role="dialog">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -287,7 +322,7 @@
                </div>
            </div>
        </div>
-        
+
        <div class="modal" id="options-modal" tabindex="-1" role="dialog">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -307,27 +342,46 @@
                        </div>
                        <div class="option-item">
                            <input type="checkbox" option="updateUrl" id="updateUrl" checked />
-                            <label for="updateUrl"> Update the URL when the input or recipe changes </label>
+                            <label for="updateUrl"> Update the URL when the input or recipe changes</label>
                        </div>
                        <div class="option-item">
                            <input type="checkbox" option="showHighlighter" id="showHighlighter" checked />
-                            <label for="showHighlighter"> Highlight selected bytes in output and input (when possible) </label>
+                            <label for="showHighlighter"> Highlight selected bytes in output and input (when possible)</label>
                        </div>
                        <div class="option-item">
                            <input type="checkbox" option="treatAsUtf8" id="treatAsUtf8" checked />
-                            <label for="treatAsUtf8"> Treat output as UTF-8 if possible </label>
+                            <label for="treatAsUtf8"> Treat output as UTF-8 if possible</label>
                        </div>
                        <div class="option-item">
                            <input type="checkbox" option="wordWrap" id="wordWrap" checked />
-                            <label for="wordWrap"> Word wrap the input and output </label>
+                            <label for="wordWrap"> Word wrap the input and output</label>
                        </div>
                        <div class="option-item">
                            <input type="checkbox" option="showErrors" id="showErrors" checked />
-                            <label for="showErrors"> Operation error reporting (recommended) </label>
+                            <label for="showErrors"> Operation error reporting (recommended)</label>
+                        </div>
+                        <div class="option-item">
+                            <input type="checkbox" option="useMetaKey" id="useMetaKey" />
+                            <label for="useMetaKey"> Use meta key for keybindings (Windows ⊞/Command ⌘)</label>
                        </div>
                        <div class="option-item">
                            <input type="number" option="errorTimeout" id="errorTimeout" />
-                            <label for="errorTimeout"> Operation error timeout in ms (0 for never) </label>
+                            <label for="errorTimeout"> Operation error timeout in ms (0 for never)</label>
+                        </div>
+                        <div class="option-item">
+                            <input type="number" option="outputFileThreshold" id="outputFileThreshold" />
+                            <label for="outputFileThreshold"> Size threshold for treating the output as a file (KiB)</label>
+                        </div>
+                        <div class="option-item">
+                            <select option="logLevel" id="logLevel">
+                                <option value="silent">Silent</option>
+                                <option value="error">Error</option>
+                                <option value="warn">Warn</option>
+                                <option value="info">Info</option>
+                                <option value="debug">Debug</option>
+                                <option value="trace">Trace</option>
+                            </select>
+                            <label for="logLevel"> Console logging level</label>
                        </div>
                    </div>
                    <div class="modal-footer">
@@ -337,7 +391,7 @@
                </div>
            </div>
        </div>
-        
+
        <div class="modal" id="favourites-modal" tabindex="-1" role="dialog">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -364,7 +418,7 @@
                </div>
            </div>
        </div>
-        
+
        <div class="modal" id="support-modal" tabindex="-1" role="dialog">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -380,6 +434,11 @@
                        </p>
                        <p>&copy; Crown Copyright 2016.</p>
                        <p>Released under the Apache Licence, Version 2.0.</p>
+                        <p>
+                            <a href="https://gitter.im/gchq/CyberChef">
+                                <img src="<%- require('../static/images/gitter-badge.svg') %>">
+                            </a>
+                        </p>
                        <br>
                        <br>
                        <div>
@@ -396,6 +455,10 @@
                                    <img aria-hidden="true" src="<%- require('../static/images/speech-16x16.png') %>" alt="Speech Balloon Icon"/>
                                    About
                                </a></li>
+                                <li role="presentation"><a href="#keybindings" aria-controls="messages" role="tab" data-toggle="tab">
+                                    <img aria-hidden="true" src="<%- require('../static/images/code-16x16.png') %>" alt="List Icon"/>
+                                    Keybindings
+                                </a></li>
                            </ul>
                            <div class="tab-content">
                                <div role="tabpanel" class="tab-pane active" id="faqs">
@@ -414,7 +477,7 @@
                                            <li><a href="#recipe=From_Hexdump()Gunzip()&input=MDAwMDAwMDAgIDFmIDhiIDA4IDAwIDEyIGJjIGYzIDU3IDAwIGZmIDBkIGM3IGMxIDA5IDAwIDIwICB8Li4uLi6881cu/y7HwS4uIHwKMDAwMDAwMTAgIDA4IDA1IGQwIDU1IGZlIDA0IDJkIGQzIDA0IDFmIGNhIDhjIDQ0IDIxIDViIGZmICB8Li7QVf4uLdMuLsouRCFb/3wKMDAwMDAwMjAgIDYwIGM3IGQ3IDAzIDE2IGJlIDQwIDFmIDc4IDRhIDNmIDA5IDg5IDBiIDlhIDdkICB8YMfXLi6%2BQC54Sj8uLi4ufXwKMDAwMDAwMzAgIDRlIGM4IDRlIDZkIDA1IDFlIDAxIDhiIDRjIDI0IDAwIDAwIDAwICAgICAgICAgICB8TshObS4uLi5MJC4uLnw">Convert data from a hexdump, then decompress</a></li>
                                            <li><a href="#recipe=RC4(%7B'option':'UTF8','string':'secret'%7D,'Hex','Hex')Disassemble_x86('64','Full%20x86%20architecture',16,0,true,true)&input=MjFkZGQyNTQwMTYwZWU2NWZlMDc3NzEwM2YyYTM5ZmJlNWJjYjZhYTBhYWJkNDE0ZjkwYzZjYWY1MzEyNzU0YWY3NzRiNzZiM2JiY2QxOTNjYjNkZGZkYmM1YTI2NTMzYTY4NmI1OWI4ZmVkNGQzODBkNDc0NDIwMWFlYzIwNDA1MDcxMzhlMmZlMmIzOTUwNDQ2ZGIzMWQyYmM2MjliZTRkM2YyZWIwMDQzYzI5M2Q3YTVkMjk2MmMwMGZlNmRhMzAwNzJkOGM1YTZiNGZlN2Q4NTlhMDQwZWVhZjI5OTczMzYzMDJmNWEwZWMxOQ">Decrypt and disassemble shellcode</a></li>
                                            <li><a href="#recipe=Fork('%5C%5Cn','%5C%5Cn',false)From_UNIX_Timestamp('Seconds%20(s)')&input=OTc4MzQ2ODAwCjEwMTI2NTEyMDAKMTA0NjY5NjQwMAoxMDgxMDg3MjAwCjExMTUzMDUyMDAKMTE0OTYwOTYwMA">Display multiple timestamps as full dates</a></li>
-                                            <li><a href="#recipe=Fork('%5C%5Cn','%5C%5Cn',false)Conditional_Jump('1',2,10)To_Hex('Space')Return()To_Base64('A-Za-z0-9%2B/%3D')&input=U29tZSBkYXRhIHdpdGggYSAxIGluIGl0ClNvbWUgZGF0YSB3aXRoIGEgMiBpbiBpdA">Carry out different operations on data of different types</a></li>
+                                            <li><a href="#recipe=Fork('%5C%5Cn','%5C%5Cn',false)Conditional_Jump('1',false,'base64',10)To_Hex('Space')Return()Label('base64')To_Base64('A-Za-z0-9%2B/%3D')&input=U29tZSBkYXRhIHdpdGggYSAxIGluIGl0ClNvbWUgZGF0YSB3aXRoIGEgMiBpbiBpdA">Carry out different operations on data of different types</a></li>
                                            <li><a href="#recipe=Register('key%3D(%5B%5C%5Cda-f%5D*)',true,false)Find_/_Replace(%7B'option':'Regex','string':'.*data%3D(.*)'%7D,'$1',true,false,true)RC4(%7B'option':'Hex','string':'$R0'%7D,'Hex','Latin1')&input=aHR0cDovL21hbHdhcmV6LmJpei9iZWFjb24ucGhwP2tleT0wZTkzMmE1YyZkYXRhPThkYjdkNWViZTM4NjYzYTU0ZWNiYjMzNGUzZGIxMQ">Use parts of the input as arguments to operations</a></li>
                                        </ul>
                                    </div>
@@ -424,8 +487,9 @@
                                        </a>
                                    </blockquote>
                                    <div class="collapse" id="faq-load-files">
-                                        <p>Yes! Just drag your file over the input box and drop it. The contents of the file will be converted into hexadecimal and the 'From Hex' operation will be added to the beginning of the recipe (if it's not already there). This is so that special characters like carriage returns aren't removed by your browser.</p>
-                                        <p>Please note that loading large files is likely to cause a crash. There's not a lot that can be done about this - browsers just aren't very good at handling and displaying large amounts of data.</p>
+                                        <p>Yes! Just drag your file over the input box and drop it.</p>
+                                        <p>CyberChef can handle files up to around 500MB (depending on your browser), however some of the operations may take a very long time to run over this much data.</p>
+                                        <p>If the output is larger than a certain threshold (default 1MiB), it will be presented to you as a file available for download. Slices of the file can be viewed in the output if you need to inspect them.</p>
                                    </div>
                                    <blockquote>
                                        <a data-toggle="collapse" data-target="#faq-fork">
@@ -449,28 +513,31 @@
                                <div role="tabpanel" class="tab-pane" id="about" style="padding: 20px;">
                                    <h5><strong>What</strong></h5>
                                    <p>A simple, intuitive web app for analysing and decoding data without having to deal with complex tools or programming languages. CyberChef encourages both technical and non-technical people to explore data formats, encryption and compression.</p><br>
-                                    
+
                                    <h5><strong>Why</strong></h5>
                                    <p>Digital data comes in all shapes, sizes and formats in the modern world – CyberChef helps to make sense of this data all on one easy-to-use platform.</p><br>

-                                    
+
                                    <h5><strong>How</strong></h5>
                                    <p>The interface is designed with simplicity at its heart. Complex techniques are now as trivial as drag-and-drop. Simple functions can be combined to build up a "recipe", potentially resulting in complex analysis, which can be shared with other users and used with their input.</p>
                                    <p>For those comfortable writing code, CyberChef is a quick and efficient way to prototype solutions to a problem which can then be scripted once proven to work.</p><br>

-                                    
+
                                    <h5><strong>Who</strong></h5>
                                    <p>It is expected that CyberChef will be useful for cybersecurity and antivirus companies. It should also appeal to the academic world and any individuals or companies involved in the analysis of digital data, be that software developers, analysts, mathematicians or casual puzzle solvers.</p><br>

-                                    
+
                                    <h5><strong>Aim</strong></h5>
                                    <p>It is hoped that by releasing CyberChef through <a href="https://github.com/gchq/CyberChef">GitHub</a>, contributions can be added which can be rolled out into future versions of the tool.</p><br>


                                    <br>
-                                    <p>There are around 150 useful operations in CyberChef for anyone working on anything vaguely Internet-related, whether you just want to convert a timestamp to a different format, decompress gzipped data, create a SHA3 hash, or parse an X.509 certificate to find out who issued it.</p>
+                                    <p>There are around 200 useful operations in CyberChef for anyone working on anything vaguely Internet-related, whether you just want to convert a timestamp to a different format, decompress gzipped data, create a SHA3 hash, or parse an X.509 certificate to find out who issued it.</p>
                                    <p>It’s the Cyber Swiss Army Knife.</p>
                                </div>
+                                <div role="tabpanel" class="tab-pane" id="keybindings" style="padding: 20px;">
+                                    <table class="table table-condensed table-bordered table-hover" id="keybList"></table>
+                                </div>
                            </div>
                        </div>
                    </div>
@@ -483,7 +550,7 @@
                </div>
            </div>
        </div>
-        
+
        <div class="modal" id="confirm-modal" tabindex="-1" role="dialog">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -504,6 +571,6 @@
                </div>
            </div>
        </div>
-        
+
    </body>
 </html>
--- a/src/web/index.js
+++ b/src/web/index.js
@@ -38,14 +38,17 @@ function main() {
    ];

    const defaultOptions = {
-        updateUrl:         true,
-        showHighlighter:   true,
-        treatAsUtf8:       true,
-        wordWrap:          true,
-        showErrors:        true,
-        errorTimeout:      4000,
-        attemptHighlight:  true,
-        theme:             "classic",
+        updateUrl:           true,
+        showHighlighter:     true,
+        treatAsUtf8:         true,
+        wordWrap:            true,
+        showErrors:          true,
+        errorTimeout:        4000,
+        attemptHighlight:    true,
+        theme:               "classic",
+        useMetaKey:          false,
+        outputFileThreshold: 1024,
+        logLevel:            "info"
    };

    document.removeEventListener("DOMContentLoaded", main, false);
@@ -53,9 +56,6 @@ function main() {
    window.app.setup();
 }

-// Fix issues with browsers that don't support console.log()
-window.console = console || {log: function() {}, error: function() {}};
-
 window.compileTime = moment.tz(COMPILE_TIME, "DD/MM/YYYY HH:mm:ss z", "UTC").valueOf();
 window.compileMessage = COMPILE_MSG;

--- a/src/web/static/images/copy-16x16.png
+++ b/src/web/static/images/copy-16x16.png
--- a/src/web/static/images/file-128x128.png
+++ b/src/web/static/images/file-128x128.png
--- a/src/web/static/images/file-32x32.png
+++ b/src/web/static/images/file-32x32.png
--- a/src/web/static/images/fork_me.png
+++ b/src/web/static/images/fork_me.png
--- a/src/web/static/images/gitter-badge.svg
+++ b/src/web/static/images/gitter-badge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="92" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="92" height="20" rx="3" fill="#fff"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h34v20H0z"/><path fill="#46BC99" d="M34 0h58v20H34z"/><path fill="url(#b)" d="M0 0h92v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="17" y="15" fill="#010101" fill-opacity=".3">chat</text><text x="17" y="14">chat</text><text x="62" y="15" fill="#010101" fill-opacity=".3">on gitter</text><text x="62" y="14">on gitter</text></g></svg>
--- a/src/web/stylesheets/components/_pane.css
+++ b/src/web/stylesheets/components/_pane.css
@@ -28,3 +28,56 @@
    margin: 0;
    padding: 0;
 }
+
+.card {
+    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
+    transition: 0.3s;
+    width: 400px;
+    height: 150px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-family: var(--primary-font-family);
+    color: var(--primary-font-colour);
+    line-height: 30px;
+    background-color: var(--primary-background-colour);
+}
+
+.card:hover {
+    box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
+}
+
+.card>img {
+    float: left;
+    width: 128px;
+    height: 128px;
+    margin-left: 10px;
+    margin-top: 11px;
+}
+
+.card-body .close {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+}
+
+.card-body {
+    float: left;
+    padding: 16px;
+    width: 250px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    user-select: text;
+}
+
+.card-body>.btn {
+    margin-bottom: 15px;
+    margin-top: 5px;
+}
+
+.card input[type=number] {
+    padding-right: 6px;
+    padding-left: 6px;
+}
--- a/src/web/stylesheets/layout/_io.css
+++ b/src/web/stylesheets/layout/_io.css
@@ -39,7 +39,7 @@
 }

 .textarea-wrapper textarea,
-.textarea-wrapper div {
+.textarea-wrapper>div {
    font-family: var(--fixed-width-font-family);
    font-size: var(--fixed-width-font-size);
    color: var(--fixed-width-font-colour);
@@ -77,6 +77,25 @@
    transition: all 0.5s ease;
 }

+#input-file,
+#output-file {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: var(--title-background-colour);
+    display: none;
+}
+
+#show-file-overlay {
+    position: absolute;
+    right: 15px;
+    top: 15px;
+    cursor: pointer;
+    display: none;
+}
+
 .io-btn-group {
    float: right;
    margin-top: -4px;
@@ -92,6 +111,8 @@
    font-family: var(--fixed-width-font-family);
    font-weight: normal;
    font-size: 8pt;
+    display: flex;
+    align-items: center;
 }

 #input-info {
--- a/src/web/stylesheets/utils/_overrides.css
+++ b/src/web/stylesheets/utils/_overrides.css
@@ -64,7 +64,8 @@ a:focus {
 .alert,
 .modal-content,
 .tooltip-inner,
-.dropdown-menu {
+.dropdown-menu,
+.input-group-addon {
    border-radius: 0 !important;
 }

@@ -187,6 +188,15 @@ optgroup {
    color: var(--primary-font-colour);
 }

+.input-group-addon:not(:first-child):not(:last-child) {
+    border-left: 0;
+    border-right: 0;
+}
+
+.input-group-btn:first-child>.btn {
+    border-right: 0;
+}
+

 /* Bootstrap-switch */

--- a/test/index.js
+++ b/test/index.js
@@ -1,3 +1,5 @@
+/* eslint no-console: 0 */
+
 /**
 * TestRunner.js
 *
@@ -25,6 +27,9 @@ import "./tests/operations/Hash.js";
 import "./tests/operations/Image.js";
 import "./tests/operations/MorseCode.js";
 import "./tests/operations/MS.js";
+import "./tests/operations/PHP.js";
+import "./tests/operations/NetBIOS.js";
+import "./tests/operations/OTP.js";
 import "./tests/operations/StrUtils.js";
 import "./tests/operations/SeqUtils.js";

--- a/test/tests/operations/Code.js
+++ b/test/tests/operations/Code.js
@@ -310,4 +310,26 @@ TestRegister.addTests([
            }
        ],
    },
+    {
+        name: "CSS selector",
+        input: '<div id="test">\n<p class="a">hello</p>\n<p>world</p>\n<p class="a">again</p>\n</div>',
+        expectedOutput: '<p class="a">hello</p>\n<p class="a">again</p>',
+        recipeConfig: [
+            {
+                "op": "CSS selector",
+                "args": ["#test p.a", "\\n"]
+            }
+        ]
+    },
+    {
+        name: "XPath expression",
+        input: '<div id="test">\n<p class="a">hello</p>\n<p>world</p>\n<p class="a">again</p>\n</div>',
+        expectedOutput: '<p class="a">hello</p>\n<p class="a">again</p>',
+        recipeConfig: [
+            {
+                "op": "XPath expression",
+                "args": ["/div/p[@class=\"a\"]", "\\n"]
+            }
+        ]
+    }
 ]);
--- a/test/tests/operations/FlowControl.js
+++ b/test/tests/operations/FlowControl.js
@@ -60,14 +60,15 @@ TestRegister.addTests([
        expectedOutput: "U29tZSBkYXRhIHdpdGggYSAxIGluIGl0\n53 6f 6d 65 20 64 61 74 61 20 77 69 74 68 20 61 20 32 20 69 6e 20 69 74\n",
        recipeConfig: [
            {"op": "Fork", "args": ["\\n", "\\n", false]},
-            {"op": "Conditional Jump", "args": ["1", "2", "10"]},
+            {"op": "Conditional Jump", "args": ["1", false, "skipReturn", "10"]},
            {"op": "To Hex", "args": ["Space"]},
            {"op": "Return", "args": []},
+            {"op": "Label", "args": ["skipReturn"]},
            {"op": "To Base64", "args": ["A-Za-z0-9+/="]}
        ]
    },
    {
-        name: "Jump: skips 0",
+        name: "Jump: Empty Label",
        input: [
            "should be changed",
        ].join("\n"),
@@ -77,7 +78,7 @@ TestRegister.addTests([
        recipeConfig: [
            {
                op: "Jump",
-                args: [0, 10],
+                args: ["", 10],
            },
            {
                op: "Find / Replace",
@@ -105,7 +106,7 @@ TestRegister.addTests([
        recipeConfig: [
            {
                op: "Jump",
-                args: [1, 10],
+                args: ["skipReplace", 10],
            },
            {
                op: "Find / Replace",
@@ -120,6 +121,10 @@ TestRegister.addTests([
                    true,
                ],
            },
+            {
+                op: "Label",
+                args: ["skipReplace"]
+            },
        ],
    },
    {
@@ -137,7 +142,7 @@ TestRegister.addTests([
        recipeConfig: [
            {
                op: "Conditional Jump",
-                args: ["match", 0, 0],
+                args: ["match", false, "", 0],
            },
            {
                op: "Find / Replace",
@@ -212,7 +217,7 @@ TestRegister.addTests([
        recipeConfig: [
            {
                op: "Conditional Jump",
-                args: ["match", 1, 10],
+                args: ["match", false, "skip match", 10],
            },
            {
                op: "Find / Replace",
@@ -227,6 +232,9 @@ TestRegister.addTests([
                    true,
                ],
            },
+            {
+                op: "Label", args: ["skip match"],
+            },
            {
                op: "Find / Replace",
                args: [
@@ -251,9 +259,13 @@ TestRegister.addTests([
            "replaced",
        ].join("\n"),
        recipeConfig: [
+            {
+                op: "Label",
+                args: ["back to the beginning"],
+            },
            {
                op: "Jump",
-                args: [1],
+                args: ["skip replace"],
            },
            {
                op: "Find / Replace",
@@ -268,9 +280,13 @@ TestRegister.addTests([
                    true,
                ],
            },
+            {
+                op: "Label",
+                args: ["skip replace"],
+            },
            {
                op: "Conditional Jump",
-                args: ["match", -2, 10],
+                args: ["match", false, "back to the beginning", 10],
            },
        ],
    },
--- a/test/tests/operations/NetBIOS.js
+++ b/test/tests/operations/NetBIOS.js
@@ -0,0 +1,34 @@
+/**
+ * NetBIOS tests.
+ *
+ * @author bwhitn [brian.m.whitney@outlook.com]
+ *
+ * @copyright Crown Copyright 2017
+ * @license Apache-2.0
+ */
+import TestRegister from "../../TestRegister.js";
+
+TestRegister.addTests([
+    {
+        name: "Encode NetBIOS name",
+        input: "The NetBIOS name",
+        expectedOutput: "FEGIGFCAEOGFHEECEJEPFDCAGOGBGNGF",
+        recipeConfig: [
+            {
+                op: "Encode NetBIOS Name",
+                args: [65],
+            },
+        ],
+    },
+    {
+        name: "Decode NetBIOS Name",
+        input: "FEGIGFCAEOGFHEECEJEPFDCAGOGBGNGF",
+        expectedOutput: "The NetBIOS name",
+        recipeConfig: [
+            {
+                op: "Decode NetBIOS Name",
+                args: [65],
+            },
+        ],
+    },
+]);
--- a/test/tests/operations/OTP.js
+++ b/test/tests/operations/OTP.js
@@ -0,0 +1,23 @@
+/**
+ * OTP HOTP tests.
+ *
+ * @author bwhitn [brian.m.whitney@outlook.com]
+ *
+ * @copyright Crown Copyright 2017
+ * @license Apache-2.0
+ */
+import TestRegister from "../../TestRegister.js";
+
+TestRegister.addTests([
+    {
+        name: "Generate HOTP",
+        input: "12345678901234567890",
+        expectedOutput: "URI: otpauth://hotp/OTPAuthentication?secret=GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ\n\nPassword: 755224",
+        recipeConfig: [
+            {
+                op: "Generate HOTP",
+                args: ["", 32, 6, 0],
+            },
+        ],
+    },
+]);
--- a/test/tests/operations/PHP.js
+++ b/test/tests/operations/PHP.js
@@ -0,0 +1,68 @@
+/**
+ * PHP tests.
+ *
+ * @author Jarmo van Lenthe
+ *
+ * @copyright Crown Copyright 2017
+ * @license Apache-2.0
+ */
+
+import TestRegister from "../../TestRegister.js";
+
+TestRegister.addTests([
+    {
+        name: "PHP Deserialize empty array",
+        input: "a:0:{}",
+        expectedOutput: "{}",
+        recipeConfig: [
+            {
+                op: "PHP Deserialize",
+                args: [true],
+            },
+        ],
+    },
+    {
+        name: "PHP Deserialize integer",
+        input: "i:10;",
+        expectedOutput: "10",
+        recipeConfig: [
+            {
+                op: "PHP Deserialize",
+                args: [true],
+            },
+        ],
+    },
+    {
+        name: "PHP Deserialize string",
+        input: "s:17:\"PHP Serialization\";",
+        expectedOutput: "\"PHP Serialization\"",
+        recipeConfig: [
+            {
+                op: "PHP Deserialize",
+                args: [true],
+            },
+        ],
+    },
+    {
+        name: "PHP Deserialize array (JSON)",
+        input: "a:2:{s:1:\"a\";i:10;i:0;a:1:{s:2:\"ab\";b:1;}}",
+        expectedOutput: "{\"a\": 10,\"0\": {\"ab\": true}}",
+        recipeConfig: [
+            {
+                op: "PHP Deserialize",
+                args: [true],
+            },
+        ],
+    },
+    {
+        name: "PHP Deserialize array (non-JSON)",
+        input: "a:2:{s:1:\"a\";i:10;i:0;a:1:{s:2:\"ab\";b:1;}}",
+        expectedOutput: "{\"a\": 10,0: {\"ab\": true}}",
+        recipeConfig: [
+            {
+                op: "PHP Deserialize",
+                args: [false],
+            },
+        ],
+    },
+]);
--- a/test/tests/operations/SeqUtils.js
+++ b/test/tests/operations/SeqUtils.js
@@ -10,8 +10,8 @@ import TestRegister from "../../TestRegister.js";
 TestRegister.addTests([
    {
        name: "SeqUtils - Numeric sort photos",
-        input: "Photo-1.jpg\nPhoto-4.jpg\nPhoto-2.jpg\nPhoto-3.jpg\n",
-        expectedOutput: "Photo-1.jpg\nPhoto-2.jpg\nPhoto-3.jpg\nPhoto-4.jpg\n",
+        input: "Photo-1.jpg\nPhoto-4.jpg\nPhoto-2.jpg\nPhoto-3.jpg",
+        expectedOutput: "Photo-1.jpg\nPhoto-2.jpg\nPhoto-3.jpg\nPhoto-4.jpg",
        recipeConfig: [
            {
                "op": "Sort",
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -35,7 +35,8 @@ module.exports = {
        new webpack.ProvidePlugin({
            $: "jquery",
            jQuery: "jquery",
-            moment: "moment-timezone"
+            moment: "moment-timezone",
+            log: "loglevel"
        }),
        new webpack.BannerPlugin({
            banner: banner,
Author	SHA1	Message	Date
n1474335	87f346d88c	7.1.0	2017-12-29 17:48:22 +00:00
n1474335	e423ff2639	Merge branch 'feature-logging'	2017-12-29 17:48:14 +00:00
n1474335	fa6905ef00	Added more comprehensive logging to FlowControl ops and added '>' prefix to all ChefWorker logs to improve clarity	2017-12-29 17:32:23 +00:00
n1474335	8684bc0158	Removed duplicate logging message	2017-12-28 18:33:59 +00:00
n1474335	a96eb450de	Improved Recipe logging	2017-12-28 18:24:29 +00:00
n1474335	d079420d46	Added logging with configurable levels to make debugging easier.	2017-12-28 18:17:38 +00:00
n1474335	124ff83206	7.0.0	2017-12-28 16:10:39 +00:00
n1474335	2c9e67ad1d	Merge branch 'feature-files'	2017-12-28 16:09:11 +00:00
n1474335	75a554e215	'To Base64' and 'To Hexdump' operations now support ArrayBuffers	2017-12-28 15:59:58 +00:00
n1474335	849d41ee56	Removed padLeft and padRight in favour of String.prototype.padStart and padEnd. 'To Hex' now supports ArrayBuffers.	2017-12-28 14:38:57 +00:00
n1474335	e18ec5f2b2	Changed inputType to ArrayBuffer for 'Frequency distribution', 'Chi Square' and 'Extract EXIF' operations.	2017-12-28 00:24:16 +00:00
n1474335	50e4daeaf2	Output info tidied up for file outputs	2017-12-27 23:05:32 +00:00
n1474335	f7f07f2cb5	Loading a new file only causes a statechange event once the whole file has loaded	2017-12-27 15:52:38 +00:00
n1474335	e2161ec934	Resolved conflicts	2017-12-27 12:50:29 +00:00
n1474335	1e4d2ba90d	Updated documentation for file support	2017-12-27 12:45:22 +00:00
n1474335	caf794b01d	Threshold for treating output as a file is now configurable	2017-12-27 12:29:10 +00:00
n1474335	e81122739b	Files can now be moved from the output to the input	2017-12-27 02:26:24 +00:00
n1474335	a0aa363203	Download filenames now persist	2017-12-27 02:01:17 +00:00
n1474335	bad0816115	Output files can be viewed in slices	2017-12-27 01:52:41 +00:00
n1474335	53a3f3d452	Changed inputType for file magic byte operations to ArrayBuffer	2017-12-26 22:05:10 +00:00
n1474335	ff94172b3c	Output files can now be downloaded using FileSaver (supports large files ~500MB)	2017-12-26 01:32:51 +00:00
n1474335	af71ca6a25	Output over 1MiB is passed back as an ArrayBuffer and an output file card is displayed.	2017-12-26 00:44:40 +00:00
n1474335	0e7989111f	Removed CryptoJS from Utils.js. UTF8 conversion is now achieved with the much smaller and actively maintained utf8 library.	2017-12-25 23:11:52 +00:00
n1474335	8ee3742216	6.8.0	2017-12-21 15:13:54 +00:00
n1474335	194eb184f3	Merge branch 'bwhitn-math'	2017-12-21 15:13:35 +00:00
n1474335	98f59ace3a	Small tweaks to the arithmetic ops	2017-12-21 15:12:06 +00:00
n1474335	c1fb6d9776	Merge branch 'math' of https://github.com/bwhitn/CyberChef into bwhitn-math	2017-12-21 14:46:37 +00:00
bwhitn	fc7d2c2f52	separated all functions and updated comments/descriptions	2017-12-21 05:58:31 -08:00
bwhitn	0fea84ed7a	WIP	2017-12-21 00:19:47 -05:00
n1474335	5e7f8e3976	Removed unnecessary whitespace	2017-12-20 16:34:21 +00:00
n1474335	fe4c5f5899	6.7.2	2017-12-20 15:56:56 +00:00
n1474335	d47b7b9242	Merge branch 'bug-numberwang'	2017-12-20 15:56:47 +00:00
n1474335	09b6661e35	Fixed trailing spaces	2017-12-20 15:51:57 +00:00
n1474335	57b1667b69	Fixed the Numberwang algorithm to correctly recognise recently discovered Numberwang values. Fixes #204	2017-12-20 15:45:58 +00:00
n1474335	5e9380b550	6.7.1	2017-12-20 13:43:31 +00:00
n1474335	fc8a0480fb	Merge branch 'bug-css-selector'	2017-12-20 13:43:00 +00:00
n1474335	317327d097	CSS selector operation now works in a web worker. Fixes #218	2017-12-20 13:30:51 +00:00
n1474335	ecd0ac2521	Updated dependencies	2017-12-19 16:53:57 +00:00
n1474335	f9eaf67db2	6.7.0	2017-12-19 15:02:23 +00:00
n1474335	99e0c8d5e3	Merge branch 'bwhitn-chi'	2017-12-19 15:02:08 +00:00
n1474335	7a951d86d8	Tidied up Chi Square operation	2017-12-19 15:02:01 +00:00
n1474335	d9dfaec84c	Merge branch 'chi' of https://github.com/bwhitn/CyberChef into bwhitn-chi	2017-12-19 14:45:50 +00:00
n1474335	80719ae368	6.6.3	2017-12-19 14:41:34 +00:00
n1474335	9407809356	Merge branch 'bwhitn-fixHOTP'	2017-12-19 14:40:30 +00:00
n1474335	f7e958e7a1	Changed HOTP inputType to byteArray	2017-12-19 14:38:13 +00:00
n1474335	5d75f8636a	Resolved conflict	2017-12-19 14:31:40 +00:00
n1474335	22aaeb3ff5	6.6.2	2017-12-19 14:25:12 +00:00
n1474335	8c29ce95e2	Merge branch 'artemisbot-bug/uuid'	2017-12-19 14:24:59 +00:00
n1474335	049fc66785	Added note to Default.js to show that crypto is included in that module.	2017-12-19 14:24:47 +00:00
n1474335	029c55fd53	Merge branch 'bug/uuid' of https://github.com/artemisbot/CyberChef into artemisbot-bug/uuid	2017-12-19 14:15:31 +00:00
n1474335	7b433b9bd6	6.6.1	2017-12-19 14:12:24 +00:00
n1474335	5ec210990b	Fixed NetBIOS space removal	2017-12-19 14:12:18 +00:00
n1474335	a7a0cacddb	Merge branch 'bwhitn-fixNB'	2017-12-19 13:54:02 +00:00
n1474335	e61ced93d6	Removed dependency for Utils.js from NetBIOS.js	2017-12-19 13:53:33 +00:00
n1474335	df122da1d2	Merge branch 'fixNB' of https://github.com/bwhitn/CyberChef into bwhitn-fixNB	2017-12-19 13:26:49 +00:00
n1474335	31d90939fe	6.6.0	2017-12-19 13:19:46 +00:00
n1474335	67b0fdf73e	Merge branch 'bwhitn-control'	2017-12-19 13:18:58 +00:00
n1474335	12fc8c22dd	Made some naming changes to Label-related operations.	2017-12-19 13:18:25 +00:00
n1474335	4e00ac9300	Files are now uploaded in a worker and not displayed in the input by default. Added ArrayBuffer Dish type.	2017-12-18 20:39:55 +00:00
bwhitn	4ca2a30249	Fixed minor errors	2017-12-18 05:33:52 -08:00
bwhitn	08a31523b2	changed the function comment	2017-12-18 05:04:11 -08:00
Matt C	4b29a61065	Fixes UUID incompatibility with webworkers	2017-12-18 09:53:23 +00:00
bwhitn	06c83cb44c	forgot a equal sign	2017-12-17 23:58:53 -05:00
bwhitn	75a5fc0ddc	Added Test, function checks, and cleaned some output.	2017-12-17 23:58:53 -05:00
bwhitn	946d165aa0	fixed decode	2017-12-17 23:57:35 -05:00
bwhitn	224d79be05	merged with master	2017-12-17 23:56:30 -05:00
bwhitn	435ed587a5	Fixed HOTP, TOTP and added test for HOTP	2017-12-17 23:53:13 -05:00
bwhitn	81082ea001	I really need to learn git	2017-12-17 23:45:15 -05:00
bwhitn	1d3229a729	rebase to current	2017-12-17 23:35:34 -05:00
bwhitn	a9e60d3450	minor fix	2017-12-17 23:29:16 -05:00
bwhitn	f9ddee7d80	Inital commit for pull	2017-12-17 23:29:16 -05:00
bwhitn	ef0d3b73b0	changed op array	2017-12-17 23:29:16 -05:00
bwhitn	5368040e83	Added additional arithmetic source	2017-12-17 23:29:16 -05:00
bwhitn	b9b4147c2f	start of math operations	2017-12-17 23:28:09 -05:00
bwhitn	caae0ec5ca	Merge pull request #2 from gchq/master update	2017-12-17 20:16:25 -08:00
bwhitn	2b47631f4d	minor fix	2017-12-17 22:15:13 -05:00
bwhitn	298e8e8491	Inital commit for pull	2017-12-17 21:57:09 -05:00
bwhitn	6ad3728314	changed op array	2017-12-17 15:29:31 -05:00
bwhitn	772f9a806e	Added additional arithmetic source	2017-12-17 15:20:58 -05:00
bwhitn	ae8d1f2178	start of math operations	2017-12-17 15:19:10 -05:00
bwhitn	9bc6c46dc3	Fixed HOTP, TOTP and added test for HOTP	2017-12-16 09:10:52 -05:00
n1474335	b48e940f2d	Merge branch 'control' of https://github.com/bwhitn/CyberChef into bwhitn-control	2017-12-08 13:47:45 +00:00
bwhitn	e500cfae75	Fixed errors	2017-11-24 10:31:26 -08:00
bwhitn	f01c0adee2	Changed jumps from index based to label base. Updated test.	2017-11-24 10:12:08 -08:00
n1474335	021cae1a95	6.5.0	2017-11-24 16:33:46 +00:00
n1474335	f66cd8f983	Merge branch 'jarmovanlenthe-master'	2017-11-24 16:32:45 +00:00
n1474335	fe8049199a	Moved PhpDeserialize.js to PHP.js to encompass possible future PHP-related ops	2017-11-24 16:32:11 +00:00
n1474335	cfb6dd9471	Merge branch 'master' of https://github.com/jarmovanlenthe/CyberChef into jarmovanlenthe-master	2017-11-24 15:19:56 +00:00
bwhitn	7abda44fd6	Added Negative Matching to conditional jumps so negative lookahead is not required.	2017-11-24 05:48:40 -08:00
bwhitn	47ce240e70	Merge pull request #1 from gchq/master updating	2017-11-24 07:50:13 -05:00
n1474335	c23d7fd79c	6.4.6	2017-11-20 17:47:48 +00:00
n1474335	555fed2d51	Merge branch 'artemisbot-features/keybindings'	2017-11-20 17:46:09 +00:00
n1474335	7a2f68e14a	Cosmetic changes to keybindings code	2017-11-20 17:45:50 +00:00
n1474335	8fd08cb2bf	Merge branch 'features/keybindings' of https://github.com/artemisbot/CyberChef into artemisbot-features/keybindings	2017-11-20 16:57:16 +00:00
n1474335	7a2b75c861	Updated dependencies	2017-11-20 16:57:04 +00:00
Jarmo van Lenthe	00074f914f	Change test to Apache-2.0 license	2017-11-16 07:37:11 -05:00
Jarmo van Lenthe	ea352e05f0	Change PHP Serialization operation to Apache-2.0 license.	2017-11-15 16:00:53 -05:00
Jarmo van Lenthe	305956cbe3	Fix copyright statement	2017-11-13 07:15:06 -05:00
Jarmo van Lenthe	5399d27875	Add space after for	2017-11-12 22:23:38 -05:00
Jarmo van Lenthe	29047c2481	Add JSDoc to helper functions and reformat while true.	2017-11-12 22:20:16 -05:00
Jarmo van Lenthe	50a32e90d9	Reformatted PHP deserialization.	2017-11-12 22:11:16 -05:00
Jarmo van Lenthe	f596fe8404	Add tests for PHP deserialization	2017-11-12 22:10:28 -05:00
Jarmo van Lenthe	4be7f89fd8	Add PHP Deserialization.	2017-11-12 21:37:29 -05:00
Matt C	8b30fdf7f1	Adds ability for user to use Meta key instead of alt for keybindings - includes dynamically updating keybinding list	2017-11-04 12:55:28 +00:00
n1474335	2cd4256ece	Updated dependencies	2017-10-26 17:00:13 +00:00
n1474335	c6a65c4686	6.4.5	2017-10-23 17:32:47 +00:00
n1474335	1553b5f54b	Fixed lint	2017-10-23 17:32:36 +00:00
n1474335	2ddd2e0a60	Added 'Copy output' button. Closes #198 .	2017-10-23 17:31:53 +00:00
Matt C	d924ede9cf	Merge remote-tracking branch 'upstream/master' into features/keybindings	2017-10-17 19:37:14 +01:00
Matt C	638e03856b	Initial keybinding functionality + documentation Todo: - allow user to specify whether to use alt or meta key (relatively easy to implement) - keybinding icon for about pane	2017-10-17 19:36:51 +01:00
n1474335	8afd77b32d	6.4.4	2017-10-13 11:29:45 +00:00
n1474335	599fefb39b	Fixed 'Parse URI' operation and improved error handling from worker	2017-10-13 11:29:22 +00:00
n1474335	ec7294d734	6.4.3	2017-10-13 09:35:34 +00:00
n1474335	c0d03db9e8	Merge branch 'qistoph-numsort'	2017-10-13 09:35:25 +00:00
n1474335	0365f96678	Merge branch 'numsort' of https://github.com/qistoph/CyberChef into qistoph-numsort	2017-10-13 09:33:09 +00:00
n1474335	40d8b42478	6.4.2	2017-10-13 09:19:22 +00:00
n1474335	e5a32ac57d	Added links to Gitter chat room	2017-10-13 09:19:16 +00:00
Chris van Marle	390d5927a4	BugFix: compare odd size elements, like empty line	2017-10-12 14:23:04 +02:00
n1474335	b61a1b4edb	6.4.1	2017-10-09 15:39:10 +00:00
n1474335	1d78578fc2	Merge branch 'slurdge-master'	2017-10-09 15:20:52 +00:00
n1474335	0e3751407b	Cleaned lint.	2017-10-09 15:17:20 +00:00
slurdge	7feafbf0e7	Fixes the lint problems and add JSDoc	2017-10-09 16:02:12 +02:00
slurdge	cfd9b16f8b	Factorize all CryptoApi.hash calls and pass string directly. Fixes #193	2017-10-09 15:43:37 +02:00
n1474335	1bbc73ec50	Removed devDependencies badge from README.md	2017-10-05 16:33:20 +00:00
n1474335	dc9ba583d5	Merge branch 'master' of github.com:gchq/CyberChef	2017-10-05 16:29:09 +00:00
n1474335	6b5ff83927	Updated dependencies	2017-10-05 16:28:49 +00:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="92" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="92" height="20" rx="3" fill="#fff"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h34v20H0z"/><path fill="#46BC99" d="M34 0h58v20H34z"/><path fill="url(#b)" d="M0 0h92v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="17" y="15" fill="#010101" fill-opacity=".3">chat</text><text x="17" y="14">chat</text><text x="62" y="15" fill="#010101" fill-opacity=".3">on gitter</text><text x="62" y="14">on gitter</text></g></svg>