Merge lp:~rpadovani/ubuntu-calculator-app/mathjs140 into lp:ubuntu-calculator-app

[Riccardo Padovani]

Updated math.js to 1.4.0

Updated math.js to 1.4.0

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:116
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/111/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2197
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/4
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/111

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/111/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

It works perfectly for me

review: Approve

=== modified file 'app/engine/math.js'
--- app/engine/math.js	2015-01-22 17:37:01 +0000
+++ app/engine/math.js	2015-03-02 09:18:55 +0000
@@ -34,8 +34,8 @@
  */
 
 (function webpackUniversalModuleDefinition(root, factory) {
-	// UCA: we delete all exports, we don't need them, and we keep only our var
-	mathJs = factory();
+    // UCA: we delete all exports, we don't need them, and we keep only our var
+    mathJs = factory();
 })(this, function() {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -92,8 +92,8 @@
 
 	'use strict';
 
-	var object = __webpack_require__(3);
-	var digits = __webpack_require__(4).digits;
+	var object = __webpack_require__(2);
+	var digits = __webpack_require__(3).digits;
 
 	/**
 	 * math.js factory function.
@@ -158,7 +158,7 @@
 
 	      // reload the constants (they depend on option number and precision)
 	      // this must be done after math.type.BigNumber.config is applied
-	      __webpack_require__(2)(math, _config);
+	      __webpack_require__(4)(math, _config);
 
 	      // TODO: remove deprecated setting some day (deprecated since version 0.17.0)
 	      if (options.number && options.number.defaultType) {
@@ -205,7 +205,7 @@
 	  math.create = create;
 
 	  // create a new BigNumber factory for this instance of math.js
-	  var BigNumber = __webpack_require__(159).constructor();
+	  var BigNumber = __webpack_require__(5).constructor();
 
 	  // extend BigNumber with a function clone
 	  if (typeof BigNumber.prototype.clone !== 'function') {
@@ -241,37 +241,40 @@
 	  }
 
 	  // errors
-	  math.error = __webpack_require__(5);
+	  math.error = __webpack_require__(6);
 
 	  // types (Matrix, Complex, Unit, ...)
 	  math.type = {};
-	  math.type.Complex = __webpack_require__(6);
-	  math.type.Range = __webpack_require__(7);
-	  math.type.Index = __webpack_require__(8);
-	  math.type.Matrix = __webpack_require__(9);
-	  math.type.Unit = __webpack_require__(10);
-	  math.type.Help = __webpack_require__(11);
-	  math.type.ResultSet = __webpack_require__(12);
+	  math.type.Complex = __webpack_require__(7);
+	  math.type.Range = __webpack_require__(8);
+	  math.type.Index = __webpack_require__(9);
+	  math.type.Matrix = __webpack_require__(10);
+	  math.type.Unit = __webpack_require__(11);
+	  math.type.Help = __webpack_require__(12);
+	  math.type.ResultSet = __webpack_require__(13);
 	  math.type.BigNumber = BigNumber;
 
-	  math.collection = __webpack_require__(13);
+	  math.collection = __webpack_require__(14);
 
 	  // expression (parse, Parser, nodes, docs)
 	  math.expression = {};
-	  math.expression.node = __webpack_require__(16);
-	  math.expression.parse = __webpack_require__(14);
-	  math.expression.Parser = __webpack_require__(15);
-	  math.expression.docs = __webpack_require__(17);
+	  math.expression.node = __webpack_require__(15);
+	  math.expression.parse = __webpack_require__(16);
+	  math.expression.Parser = __webpack_require__(17);
+	  math.expression.docs = __webpack_require__(18);
+
+	  // serialization utilities
+	  math.json = {
+	    reviver: __webpack_require__(19)
+	  };
 
 	  // expression parser
-	  __webpack_require__(29)(math, _config);
-	  __webpack_require__(30)(math, _config);
 	  __webpack_require__(31)(math, _config);
 	  __webpack_require__(32)(math, _config);
-
-	  // functions - arithmetic
 	  __webpack_require__(33)(math, _config);
 	  __webpack_require__(34)(math, _config);
+
+	  // functions - arithmetic
 	  __webpack_require__(35)(math, _config);
 	  __webpack_require__(36)(math, _config);
 	  __webpack_require__(37)(math, _config);
@@ -299,25 +302,25 @@
 	  __webpack_require__(59)(math, _config);
 	  __webpack_require__(60)(math, _config);
 	  __webpack_require__(61)(math, _config);
-
-	  // functions - bitwise
 	  __webpack_require__(62)(math, _config);
 	  __webpack_require__(63)(math, _config);
+
+	  // functions - bitwise
 	  __webpack_require__(64)(math, _config);
 	  __webpack_require__(65)(math, _config);
 	  __webpack_require__(66)(math, _config);
 	  __webpack_require__(67)(math, _config);
 	  __webpack_require__(68)(math, _config);
-
-	  // functions - complex
 	  __webpack_require__(69)(math, _config);
 	  __webpack_require__(70)(math, _config);
+
+	  // functions - complex
 	  __webpack_require__(71)(math, _config);
 	  __webpack_require__(72)(math, _config);
-
-	  // functions - construction
 	  __webpack_require__(73)(math, _config);
 	  __webpack_require__(74)(math, _config);
+
+	  // functions - construction
 	  __webpack_require__(75)(math, _config);
 	  __webpack_require__(76)(math, _config);
 	  __webpack_require__(77)(math, _config);
@@ -326,16 +329,16 @@
 	  __webpack_require__(80)(math, _config);
 	  __webpack_require__(81)(math, _config);
 	  __webpack_require__(82)(math, _config);
-
-	  // functions - logical
 	  __webpack_require__(83)(math, _config);
 	  __webpack_require__(84)(math, _config);
+
+	  // functions - logical
 	  __webpack_require__(85)(math, _config);
 	  __webpack_require__(86)(math, _config);
-
-	  // functions - matrix
 	  __webpack_require__(87)(math, _config);
 	  __webpack_require__(88)(math, _config);
+
+	  // functions - matrix
 	  __webpack_require__(89)(math, _config);
 	  __webpack_require__(90)(math, _config);
 	  __webpack_require__(91)(math, _config);
@@ -350,41 +353,41 @@
 	  __webpack_require__(100)(math, _config);
 	  __webpack_require__(101)(math, _config);
 	  __webpack_require__(102)(math, _config);
-
-	  // functions - probability
-	  //require('./function/probability/distribution')(math, _config); // TODO: rethink math.distribution
 	  __webpack_require__(103)(math, _config);
 	  __webpack_require__(104)(math, _config);
 	  __webpack_require__(105)(math, _config);
+
+	  // functions - probability
+	  //require('./function/probability/distribution')(math, _config); // TODO: rethink math.distribution
 	  __webpack_require__(106)(math, _config);
 	  __webpack_require__(107)(math, _config);
 	  __webpack_require__(108)(math, _config);
 	  __webpack_require__(109)(math, _config);
-
-	  // functions - relational
 	  __webpack_require__(110)(math, _config);
 	  __webpack_require__(111)(math, _config);
 	  __webpack_require__(112)(math, _config);
+
+	  // functions - relational
 	  __webpack_require__(113)(math, _config);
 	  __webpack_require__(114)(math, _config);
 	  __webpack_require__(115)(math, _config);
 	  __webpack_require__(116)(math, _config);
 	  __webpack_require__(117)(math, _config);
-
-	  // functions - statistics
 	  __webpack_require__(118)(math, _config);
 	  __webpack_require__(119)(math, _config);
 	  __webpack_require__(120)(math, _config);
+
+	  // functions - statistics
 	  __webpack_require__(121)(math, _config);
 	  __webpack_require__(122)(math, _config);
 	  __webpack_require__(123)(math, _config);
 	  __webpack_require__(124)(math, _config);
 	  __webpack_require__(125)(math, _config);
-
-	  // functions - trigonometry
 	  __webpack_require__(126)(math, _config);
 	  __webpack_require__(127)(math, _config);
 	  __webpack_require__(128)(math, _config);
+
+	  // functions - trigonometry
 	  __webpack_require__(129)(math, _config);
 	  __webpack_require__(130)(math, _config);
 	  __webpack_require__(131)(math, _config);
@@ -398,11 +401,7 @@
 	  __webpack_require__(139)(math, _config);
 	  __webpack_require__(140)(math, _config);
 	  __webpack_require__(141)(math, _config);
-
-	  // functions - units
 	  __webpack_require__(142)(math, _config);
-
-	  // functions - utils
 	  __webpack_require__(143)(math, _config);
 	  __webpack_require__(144)(math, _config);
 	  __webpack_require__(145)(math, _config);
@@ -412,6 +411,22 @@
 	  __webpack_require__(149)(math, _config);
 	  __webpack_require__(150)(math, _config);
 	  __webpack_require__(151)(math, _config);
+	  __webpack_require__(152)(math, _config);
+	  __webpack_require__(153)(math, _config);
+
+	  // functions - units
+	  __webpack_require__(154)(math, _config);
+
+	  // functions - utils
+	  __webpack_require__(155)(math, _config);
+	  __webpack_require__(156)(math, _config);
+	  __webpack_require__(157)(math, _config);
+	  __webpack_require__(158)(math, _config);
+	  __webpack_require__(159)(math, _config);
+	  __webpack_require__(160)(math, _config);
+	  __webpack_require__(161)(math, _config);
+	  __webpack_require__(162)(math, _config);
+	  __webpack_require__(163)(math, _config);
 
 	  // TODO: deprecated since version 0.25.0, remove some day.
 	  math.ifElse = function () {
@@ -419,23 +434,25 @@
 	  };
 
 	  // constants
-	  __webpack_require__(2)(math, _config);
+	  __webpack_require__(4)(math, _config);
 
 	  // attach transform functions (for converting one-based indices to zero-based)
-	  __webpack_require__(18)(math, _config);
-	  __webpack_require__(19)(math, _config);
-	  __webpack_require__(20)(math, _config);
-	  __webpack_require__(21)(math, _config);
-	  __webpack_require__(22)(math, _config);
-	  __webpack_require__(23)(math, _config);
-	  __webpack_require__(24)(math, _config);
-	  __webpack_require__(25)(math, _config);
-	  __webpack_require__(26)(math, _config);
-	  __webpack_require__(27)(math, _config);
+	  math.expression.transform = {
+	    concat: __webpack_require__(20)(math, _config),
+	    filter: __webpack_require__(21)(math, _config),
+	    forEach:__webpack_require__(22)(math, _config),
+	    index:  __webpack_require__(23)(math, _config),
+	    map:    __webpack_require__(24)(math, _config),
+	    max:    __webpack_require__(25)(math, _config),
+	    mean:   __webpack_require__(26)(math, _config),
+	    min:    __webpack_require__(27)(math, _config),
+	    range:  __webpack_require__(28)(math, _config),
+	    subset: __webpack_require__(29)(math, _config)
+	  };
 
 	  // selector (we initialize after all functions are loaded)
 	  math.chaining = {};
-	  math.chaining.Chain = __webpack_require__(28)(math, _config);
+	  math.chaining.Chain = __webpack_require__(30)(math, _config);
 	  math.chaining.Selector = math.chaining.Chain; // TODO: deprecate in v2.0
 
 	  // apply provided configuration options
@@ -464,49 +481,6 @@
 
 	'use strict';
 
-	module.exports = function (math, config) {
-	  var bignumber = __webpack_require__(152);
-	  var Complex = __webpack_require__(6);
-	  var BigNumber = math.type.BigNumber;
-
-	  var big = config.number === 'bignumber';
-
-	  // TODO: in case of support for defineProperty, we can lazy evaluate the BigNumber constants by creating them as properties (calculation of PI is slow for example)
-	  math.pi          = big ? bignumber.pi(config.precision)  : Math.PI;
-	  math.tau         = big ? bignumber.tau(config.precision) : Math.PI * 2;
-	  math.e           = big ? bignumber.e(config.precision)   : Math.E;
-	  math.phi         = big ? bignumber.phi(config.precision) : 1.61803398874989484820458683436563811772030917980576286213545; // golden ratio, (1+sqrt(5))/2
-
-	  math.i           = new Complex(0, 1);
-
-	  math['Infinity'] = Infinity;
-	  math['NaN']      = NaN;
-	  math['true']     = true;
-	  math['false']    = false;
-	  math['null']     = null;
-	  math['uninitialized'] = __webpack_require__(153).UNINITIALIZED;
-
-	  // uppercase constants (for compatibility with built-in Math)
-	  math.E           = math.e;
-	  math.LN2         = big ? new BigNumber(2).ln()                        : Math.LN2;
-	  math.LN10        = big ? new BigNumber(10).ln()                       : Math.LN10;
-	  math.LOG2E       = big ? new BigNumber(1).div(new BigNumber(2).ln())  : Math.LOG2E;
-	  math.LOG10E      = big ? new BigNumber(1).div(new BigNumber(10).ln()) : Math.LOG10E;
-	  math.PI          = math.pi;
-	  math.SQRT1_2     = big ? new BigNumber(0.5).sqrt()                    : Math.SQRT1_2;
-	  math.SQRT2       = big ? new BigNumber(2).sqrt()                      : Math.SQRT2;
-
-	  // meta information
-	  math.version = __webpack_require__(154);
-	};
-
-
-/***/ },
-/* 3 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
 	/**
 	 * Clone an object
 	 *
@@ -652,9 +626,60 @@
 	  }
 	};
 
+	/**
+	 * Test whether the current JavaScript engine supports Object.defineProperty
+	 * @returns {boolean} returns true if supported
+	 */
+	exports.canDefineProperty = function () {
+	  // test needed for broken IE8 implementation
+	  try {
+	    if (Object.defineProperty) {
+	      Object.defineProperty({}, 'x', {});
+	      return true;
+	    }
+	  } catch (e) {}
+
+	  return false;
+	};
+
+	/**
+	 * Attach a lazy loading property to a constant.
+	 * The given function `fn` is called once when the property is first requested.
+	 * On older browsers (<IE8), the function will fall back to direct evaluation
+	 * of the properties value.
+	 * @param {Object} object   Object where to add the property
+	 * @param {string} prop     Property name
+	 * @param {function} fn     Function returning the property value. Called
+	 *                          without arguments.
+	 */
+	exports.lazy = function (object, prop, fn) {
+	  if (exports.canDefineProperty()) {
+	    var _uninitialized = true;
+	    var _value;
+	    Object.defineProperty(object, prop, {
+	      get: function () {
+	        if (_uninitialized) {
+	          _value = fn();
+	          _uninitialized = false;
+	        }
+	        return _value;
+	      },
+
+	      set: function (value) {
+	        _value = value;
+	        _uninitialized = false;
+	      }
+	    });
+	  }
+	  else {
+	    // fall back to immediate evaluation
+	    object[prop] = fn();
+	  }
+	};
+
 
 /***/ },
-/* 4 */
+/* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -938,27 +963,125 @@
 
 
 /***/ },
+/* 4 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math, config) {
+	  var object = __webpack_require__(2);
+	  var bignumber = __webpack_require__(164);
+	  var Complex = __webpack_require__(7);
+	  var BigNumber = math.type.BigNumber;
+
+	  math['true']     = true;
+	  math['false']    = false;
+	  math['null']     = null;
+	  math['uninitialized'] = __webpack_require__(165).UNINITIALIZED;
+
+	  if (config.number === 'bignumber') {
+	    math['Infinity'] = new BigNumber(Infinity);
+	    math['NaN']      = new BigNumber(NaN);
+
+	    object.lazy(math, 'pi',  function () {return bignumber.pi(config.precision)});
+	    object.lazy(math, 'tau', function () {return bignumber.tau(config.precision)});
+	    object.lazy(math, 'e',   function () {return bignumber.e(config.precision)});
+	    object.lazy(math, 'phi', function () {return bignumber.phi(config.precision)}); // golden ratio, (1+sqrt(5))/2
+
+	    // uppercase constants (for compatibility with built-in Math)
+	    object.lazy(math, 'E',       function () {return math.e;});
+	    object.lazy(math, 'LN2',     function () {return new BigNumber(2).ln();});
+	    object.lazy(math, 'LN10',    function () {return new BigNumber(10).ln()});
+	    object.lazy(math, 'LOG2E',   function () {return new BigNumber(1).div(new BigNumber(2).ln());});
+	    object.lazy(math, 'LOG10E',  function () {return new BigNumber(1).div(new BigNumber(10).ln())});
+	    object.lazy(math, 'PI',      function () {return math.pi});
+	    object.lazy(math, 'SQRT1_2', function () {return new BigNumber('0.5').sqrt()});
+	    object.lazy(math, 'SQRT2',   function () {return new BigNumber(2).sqrt()});
+	  }
+	  else {
+	    math['Infinity'] = Infinity;
+	    math['NaN']      = NaN;
+
+	    math.pi  = Math.PI;
+	    math.tau = Math.PI * 2;
+	    math.e   = Math.E;
+	    math.phi = 1.61803398874989484820458683436563811772030917980576286213545; // golden ratio, (1+sqrt(5))/2
+
+	    // uppercase constants (for compatibility with built-in Math)
+	    math.E           = math.e;
+	    math.LN2         = Math.LN2;
+	    math.LN10        = Math.LN10;
+	    math.LOG2E       = Math.LOG2E;
+	    math.LOG10E      = Math.LOG10E;
+	    math.PI          = math.pi;
+	    math.SQRT1_2     = Math.SQRT1_2;
+	    math.SQRT2       = Math.SQRT2;
+	  }
+
+	  // complex i
+	  math.i = new Complex(0, 1);
+
+	  // meta information
+	  math.version = __webpack_require__(166);
+	};
+
+
+/***/ },
 /* 5 */
 /***/ function(module, exports, __webpack_require__) {
 
+	var BigNumber = __webpack_require__(336);
+
+	// FIXME: replace all require('decimal.js') with require('./BigNumber').
+
+	/**
+	 * Get a JSON representation of a BigNumber containing
+	 * type information
+	 * @returns {Object} Returns a JSON object structured as:
+	 *                   `{"mathjs": "BigNumber", "value": "0.2"}`
+	 */
+	BigNumber.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'BigNumber',
+	    value: this.toString()
+	  };
+	};
+
+	/**
+	 * Instantiate a BigNumber from a JSON object
+	 * @param {Object} json  a JSON object structured as:
+	 *                       `{"mathjs": "BigNumber", "value": "0.2"}`
+	 * @return {BigNumber}
+	 */
+	BigNumber.fromJSON = function (json) {
+	  return new BigNumber(json.value);
+	};
+
+	module.exports = BigNumber;
+
+
+/***/ },
+/* 6 */
+/***/ function(module, exports, __webpack_require__) {
+
 	'use strict';
 
-	exports.ArgumentsError = __webpack_require__(155);
-	exports.DimensionError = __webpack_require__(156);
-	exports.IndexError = __webpack_require__(157);
-	exports.UnsupportedTypeError = __webpack_require__(158);
+	exports.ArgumentsError = __webpack_require__(167);
+	exports.DimensionError = __webpack_require__(168);
+	exports.IndexError = __webpack_require__(169);
+	exports.UnsupportedTypeError = __webpack_require__(170);
 
 	// TODO: implement an InvalidValueError?
 
 
 /***/ },
-/* 6 */
+/* 7 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var util = __webpack_require__(160),
-	    Unit = __webpack_require__(10),
+	var util = __webpack_require__(171),
+	    Unit = __webpack_require__(11),
 	    number = util.number,
 
 	    isNumber = util.number.isNumber,
@@ -1334,20 +1457,30 @@
 	 * @return {String} str
 	 */
 	Complex.prototype.format = function (options) {
-	  var str = '',
-	      strRe = number.format(this.re, options),
-	      strIm = number.format(this.im, options);
-
-	  if (this.im == 0) {
+	  var str = '';
+	  var im = this.im;
+	  var re = this.re;
+	  var strRe = number.format(this.re, options);
+	  var strIm = number.format(this.im, options);
+
+	  // round either re or im when smaller than the configured precision
+	  var precision = isNumber(options) ? options : options ? options.precision : null;
+	  if (precision !== null) {
+	    var epsilon = Math.pow(10, -precision);
+	    if (Math.abs(re / im) < epsilon) {re = 0;}
+	    if (Math.abs(im / re) < epsilon) {im = 0;}
+	  }
+
+	  if (im == 0) {
 	    // real value
 	    str = strRe;
 	  }
-	  else if (this.re == 0) {
+	  else if (re == 0) {
 	    // purely complex value
-	    if (this.im == 1) {
+	    if (im == 1) {
 	      str = 'i';
 	    }
-	    else if (this.im == -1) {
+	    else if (im == -1) {
 	      str = '-i';
 	    }
 	    else {
@@ -1356,8 +1489,8 @@
 	  }
 	  else {
 	    // complex value
-	    if (this.im > 0) {
-	      if (this.im == 1) {
+	    if (im > 0) {
+	      if (im == 1) {
 	        str = strRe + ' + i';
 	      }
 	      else {
@@ -1365,7 +1498,7 @@
 	      }
 	    }
 	    else {
-	      if (this.im == -1) {
+	      if (im == -1) {
 	        str = strRe + ' - i';
 	      }
 	      else {
@@ -1386,6 +1519,31 @@
 	};
 
 	/**
+	 * Get a JSON representation of the complex number
+	 * @returns {Object} Returns a JSON object structured as:
+	 *                   `{"mathjs": "Complex", "re": 2, "im": 3}`
+	 */
+	Complex.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'Complex',
+	    re: this.re,
+	    im: this.im
+	  };
+	};
+
+	/**
+	 * Create a Complex number from a JSON object
+	 * @param {Object} json  A JSON Object structured as
+	 *                       {"mathjs": "Complex", "re": 2, "im": 3}
+	 *                       All properties are optional, default values
+	 *                       for `re` and `im` are 0.
+	 * @return {Complex} Returns a new Complex number
+	 */
+	Complex.fromJSON = function (json) {
+	  return new Complex(json);
+	};
+
+	/**
 	 * Returns a string representation of the complex number.
 	 * @return {String} str
 	 */
@@ -1396,12 +1554,12 @@
 
 
 /***/ },
-/* 7 */
+/* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var util = __webpack_require__(160);
+	var util = __webpack_require__(171);
 
 	var number = util.number;
 	var string = util.string;
@@ -1666,19 +1824,43 @@
 	  return this.format();
 	};
 
+	/**
+	 * Get a JSON representation of the range
+	 * @returns {Object} Returns a JSON object structured as:
+	 *                   `{"mathjs": "Range", "start": 2, "end": 4, "step": 1}`
+	 */
+	Range.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'Range',
+	    start: this.start,
+	    end: this.end,
+	    step: this.step
+	  };
+	};
+
+	/**
+	 * Instantiate a Range from a JSON object
+	 * @param {Object} json A JSON object structured as:
+	 *                      `{"mathjs": "Range", "start": 2, "end": 4, "step": 1}`
+	 * @return {Range}
+	 */
+	Range.fromJSON = function (json) {
+	  return new Range(json.start, json.end, json.step);
+	};
+
 	// exports
 	module.exports = Range;
 
 
 /***/ },
-/* 8 */
+/* 9 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var util = __webpack_require__(160),
+	var util = __webpack_require__(171),
 
-	    Range = __webpack_require__(7),
+	    Range = __webpack_require__(8),
 
 	    number = util.number,
 
@@ -1941,28 +2123,50 @@
 	  return '[' + strings.join(', ') + ']';
 	};
 
+	/**
+	 * Get a JSON representation of the Index
+	 * @returns {Object} Returns a JSON object structured as:
+	 *                   `{"mathjs": "Index", "ranges": [{"mathjs": "Range", start: 0, end: 10, step:1}, ...]}`
+	 */
+	Index.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'Index',
+	    ranges: this._ranges
+	  };
+	};
+
+	/**
+	 * Instantiate an Index from a JSON object
+	 * @param {Object} json A JSON object structured as:
+	 *                     `{"mathjs": "Index", "ranges": [{"mathjs": "Range", start: 0, end: 10, step:1}, ...]}`
+	 * @return {Index}
+	 */
+	Index.fromJSON = function (json) {
+	  return Index.create(json.ranges);
+	};
+
 	// exports
 	module.exports = Index;
 
 
 /***/ },
-/* 9 */
+/* 10 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var util = __webpack_require__(160),
-	    DimensionError = __webpack_require__(156),
-
-	    Index = __webpack_require__(8),
-
-	    number = util.number,
-	    string = util.string,
-	    array = util.array,
-	    object = util.object,
-
-	    isArray = Array.isArray,
-	    validateIndex = array.validateIndex;
+	var util = __webpack_require__(171);
+	var DimensionError = __webpack_require__(168);
+
+	var Index = __webpack_require__(9);
+
+	var number = util.number;
+	var string = util.string;
+	var array = util.array;
+	var object = util.object;
+
+	var isArray = Array.isArray;
+	var validateIndex = array.validateIndex;
 
 	/**
 	 * @constructor Matrix
@@ -2443,6 +2647,28 @@
 	};
 
 	/**
+	 * Get a JSON representation of the matrix
+	 * @returns {Object}
+	 */
+	Matrix.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'Matrix',
+	    data: this._data
+	  }
+	};
+
+	/**
+	 * Generate a matrix from a JSON object
+	 * @param {Object} json  An object structured like
+	 *                       `{"mathjs": "Matrix", data: []}`,
+	 *                       where mathjs is optional
+	 * @returns {Matrix}
+	 */
+	Matrix.fromJSON = function (json) {
+	  return new Matrix(json.data);
+	};
+
+	/**
 	 * Preprocess data, which can be an Array or Matrix with nested Arrays and
 	 * Matrices. Replaces all nested Matrices with Arrays
 	 * @param {Array} data
@@ -2467,12 +2693,12 @@
 
 
 /***/ },
-/* 10 */
+/* 11 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var util = __webpack_require__(160),
+	var util = __webpack_require__(171),
 
 	    number = util.number,
 	    string = util.string,
@@ -2731,13 +2957,13 @@
 	};
 
 	/**
-	 * Unnormalize a value, based on its currently set unit
+	 * Denormalize a value, based on its currently set unit
 	 * @param {Number} value
 	 * @param {Number} [prefixValue]    Optional prefix value to be used
-	 * @return {Number} unnormalized value
+	 * @return {Number} denormalized value
 	 * @private
 	 */
-	Unit.prototype._unnormalize = function (value, prefixValue) {
+	Unit.prototype._denormalize = function (value, prefixValue) {
 	  if (prefixValue == undefined) {
 	    return value / this.unit.value / this.prefix.value - this.unit.offset;
 	  }
@@ -2856,7 +3082,7 @@
 	 */
 	Unit.prototype.toNumber = function (valuelessUnit) {
 	  var other = this.to(valuelessUnit);
-	  return other._unnormalize(other.value, other.prefix.value);
+	  return other._denormalize(other.value, other.prefix.value);
 	};
 
 
@@ -2869,6 +3095,32 @@
 	};
 
 	/**
+	 * Get a JSON representation of the unit
+	 * @returns {Object} Returns a JSON object structured as:
+	 *                   `{"mathjs": "Unit", "value": 2, "unit": "cm", "fixPrefix": false}`
+	 */
+	Unit.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'Unit',
+	    value: this._denormalize(this.value),
+	    unit: this.prefix.name + this.unit.name,
+	    fixPrefix: this.fixPrefix
+	  };
+	};
+
+	/**
+	 * Instantiate a Unit from a JSON object
+	 * @param {Object} json  A JSON object structured as:
+	 *                       `{"mathjs": "Unit", "value": 2, "unit": "cm", "fixPrefix": false}`
+	 * @return {Unit}
+	 */
+	Unit.fromJSON = function (json) {
+	  var unit = new Unit(json.value, json.unit);
+	  unit.fixPrefix = json.fixPrefix || false;
+	  return unit;
+	};
+
+	/**
 	 * Returns the string representation of the unit.
 	 * @return {String}
 	 */
@@ -2888,12 +3140,12 @@
 
 	  if (this.value !== null && !this.fixPrefix) {
 	    var bestPrefix = this._bestPrefix();
-	    value = this._unnormalize(this.value, bestPrefix.value);
+	    value = this._denormalize(this.value, bestPrefix.value);
 	    str = number.format(value, options) + ' ';
 	    str += bestPrefix.name + this.unit.name;
 	  }
 	  else {
-	    value = this._unnormalize(this.value);
+	    value = this._denormalize(this.value);
 	    str = (this.value !== null) ? (number.format(value, options) + ' ') : '';
 	    str += this.prefix.name + this.unit.name;
 	  }
@@ -3221,9 +3473,9 @@
 	  ampere: {name: 'ampere', base: BASE_UNITS.CURRENT, prefixes: PREFIXES.LONG, value: 1, offset: 0},
 
 	  // Temperature
-	  // K(C) = °C + 273.15
-	  // K(F) = (°F + 459.67) / 1.8
-	  // K(R) = °R / 1.8
+	  // K(C) = °C + 273.15
+	  // K(F) = (°F + 459.67) / 1.8
+	  // K(R) = °R / 1.8
 	  K: {name: 'K', base: BASE_UNITS.TEMPERATURE, prefixes: PREFIXES.NONE, value: 1, offset: 0},
 	  degC: {name: 'degC', base: BASE_UNITS.TEMPERATURE, prefixes: PREFIXES.NONE, value: 1, offset: 273.15},
 	  degF: {name: 'degF', base: BASE_UNITS.TEMPERATURE, prefixes: PREFIXES.NONE, value: 1/1.8, offset: 459.67},
@@ -3339,34 +3591,33 @@
 
 
 /***/ },
-/* 11 */
+/* 12 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var util = __webpack_require__(160),
-	    object = util.object,
-	    string = util.string;
+	var util = __webpack_require__(171);
+	var object = util.object;
+	var string = util.string;
 
 	/**
 	 * Documentation object
-	 * @param {Object} math The math.js namespace
 	 * @param {Object} doc  Object containing properties:
 	 *                      {String} name
 	 *                      {String} category
+	 *                      {String} description
 	 *                      {String[]} syntax
 	 *                      {String[]} examples
 	 *                      {String[]} seealso
 	 * @constructor
 	 */
-	function Help (math, doc) {
+	function Help (doc) {
 	  if (!(this instanceof Help)) {
 	    throw new SyntaxError('Constructor must be called with the new operator');
 	  }
 
-	  // TODO: throw an error when math or doc is not provided
+	  if (!doc)  throw new Error('Argument "doc" missing');
 
-	  this.math = math;
 	  this.doc = doc;
 	}
 
@@ -3381,10 +3632,11 @@
 
 	/**
 	 * Generate readable description from a Help object
+	 * @param {Object} [math]   A math instance, used to evaluate the examples
 	 * @return {String} readableDoc
 	 * @private
 	 */
-	Help.prototype.toString = function () {
+	Help.prototype.toText = function (math) {
 	  var doc = this.doc || {};
 	  var desc = '\n';
 
@@ -3401,20 +3653,23 @@
 	    desc += 'Syntax:\n    ' + doc.syntax.join('\n    ') + '\n\n';
 	  }
 	  if (doc.examples) {
-	    var parser = this.math.parser();
+	    var parser = math && math.parser();
 	    desc += 'Examples:\n';
 	    for (var i = 0; i < doc.examples.length; i++) {
 	      var expr = doc.examples[i];
-	      var res;
-	      try {
-	        res = parser.eval(expr);
-	      }
-	      catch (e) {
-	        res = e;
-	      }
 	      desc += '    ' + expr + '\n';
-	      if (res !== undefined && !(res instanceof Help)) {
-	        desc += '        ' + string.format(res, {precision: 14}) + '\n';
+
+	      if (parser) {
+	        var res;
+	        try {
+	          res = parser.eval(expr);
+	        }
+	        catch (e) {
+	          res = e;
+	        }
+	        if (res !== undefined && !(res instanceof Help)) {
+	          desc += '        ' + string.format(res, {precision: 14}) + '\n';
+	        }
 	      }
 	    }
 	    desc += '\n';
@@ -3426,13 +3681,37 @@
 	  return desc;
 	};
 
-	// TODO: implement a toHTML function in Help
+	/**
+	 * Generate a string representation of the Help object
+	 * @return {String} Returns a string
+	 * @private
+	 */
+	Help.prototype.toString = function () {
+	  return this.toText();
+	};
 
 	/**
 	 * Export the help object to JSON
 	 */
 	Help.prototype.toJSON = function () {
-	  return object.clone(this.doc);
+	  var obj = object.clone(this.doc);
+	  obj.mathjs = 'Help';
+	  return obj;
+	};
+
+	/**
+	 * Instantiate a Help object from a JSON object
+	 * @param {Object} json
+	 * @returns {Help} Returns a new Help object
+	 */
+	Help.fromJSON = function (json) {
+	  var doc = {};
+	  for (var prop in json) {
+	    if (prop !== 'mathjs') { // ignore mathjs field
+	      doc[prop] = json[prop];
+	    }
+	  }
+	  return new Help(doc);
 	};
 
 	/**
@@ -3445,7 +3724,7 @@
 
 
 /***/ },
-/* 12 */
+/* 13 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3479,22 +3758,44 @@
 	  return '[' + this.entries.join(', ') + ']';
 	};
 
+	/**
+	 * Get a JSON representation of the ResultSet
+	 * @returns {Object} Returns a JSON object structured as:
+	 *                   `{"mathjs": "ResultSet", "entries": [...]}`
+	 */
+	ResultSet.prototype.toJSON = function () {
+	  return {
+	    mathjs: 'ResultSet',
+	    entries: this.entries
+	  };
+	};
+
+	/**
+	 * Instantiate a ResultSet from a JSON object
+	 * @param {Object} json  A JSON object structured as:
+	 *                       `{"mathjs": "ResultSet", "entries": [...]}`
+	 * @return {ResultSet}
+	 */
+	ResultSet.fromJSON = function (json) {
+	  return new ResultSet(json.entries);
+	};
+
 	module.exports = ResultSet;
 
 
 /***/ },
-/* 13 */
+/* 14 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// utility methods for arrays and matrices
 	'use strict';
 
-	var util = __webpack_require__(160),
-
-	    IndexError = __webpack_require__(157),
-	    DimensionError = __webpack_require__(156),
-
-	    Matrix = __webpack_require__(9),
+	var util = __webpack_require__(171),
+
+	    IndexError = __webpack_require__(169),
+	    DimensionError = __webpack_require__(168),
+
+	    Matrix = __webpack_require__(10),
 
 	    array = util.array,
 	    isArray = util.array.isArray,
@@ -3750,38 +4051,59 @@
 
 
 /***/ },
-/* 14 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	var util = __webpack_require__(160),
-
-	    ArgumentsError = __webpack_require__(155),
+/* 15 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	exports.ArrayNode = __webpack_require__(172);
+	exports.AssignmentNode = __webpack_require__(173);
+	exports.BlockNode = __webpack_require__(174);
+	exports.ConditionalNode = __webpack_require__(175);
+	exports.ConstantNode = __webpack_require__(176);
+	exports.IndexNode = __webpack_require__(177);
+	exports.FunctionAssignmentNode = __webpack_require__(178);
+	exports.FunctionNode = __webpack_require__(179);
+	exports.Node = __webpack_require__(180);
+	exports.OperatorNode = __webpack_require__(181);
+	exports.RangeNode = __webpack_require__(182);
+	exports.SymbolNode = __webpack_require__(183);
+	exports.UpdateNode = __webpack_require__(184);
+
+
+/***/ },
+/* 16 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var util = __webpack_require__(171),
+
+	    ArgumentsError = __webpack_require__(167),
 
 	    isString = util.string.isString,
 	    isArray = Array.isArray,
 	    type = util.types.type,
 
 	    // types
-	    Complex = __webpack_require__(6),
-	    Matrix = __webpack_require__(9),
-	    Unit = __webpack_require__(10),
-	    collection = __webpack_require__(13),
+	    Complex = __webpack_require__(7),
+	    Matrix = __webpack_require__(10),
+	    Unit = __webpack_require__(11),
+	    collection = __webpack_require__(14),
 
 	    // scope and nodes
-	    ArrayNode = __webpack_require__(161),
-	    AssignmentNode = __webpack_require__(162),
-	    BlockNode = __webpack_require__(163),
-	    ConditionalNode = __webpack_require__(164),
-	    ConstantNode = __webpack_require__(165),
-	    FunctionAssignmentNode = __webpack_require__(166),
-	    IndexNode = __webpack_require__(167),
-	    OperatorNode = __webpack_require__(168),
-	    FunctionNode = __webpack_require__(169),
-	    RangeNode = __webpack_require__(170),
-	    SymbolNode = __webpack_require__(171),
-	    UpdateNode = __webpack_require__(172);
+	    ArrayNode = __webpack_require__(172),
+	    AssignmentNode = __webpack_require__(173),
+	    BlockNode = __webpack_require__(174),
+	    ConditionalNode = __webpack_require__(175),
+	    ConstantNode = __webpack_require__(176),
+	    FunctionAssignmentNode = __webpack_require__(178),
+	    IndexNode = __webpack_require__(177),
+	    OperatorNode = __webpack_require__(181),
+	    FunctionNode = __webpack_require__(179),
+	    RangeNode = __webpack_require__(182),
+	    SymbolNode = __webpack_require__(183),
+	    UpdateNode = __webpack_require__(184);
 
 	/**
 	 * Parse an expression. Returns a node tree, which can be evaluated by
@@ -5136,12 +5458,12 @@
 
 
 /***/ },
-/* 15 */
+/* 17 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var _parse = __webpack_require__(14);
+	var _parse = __webpack_require__(16);
 
 	/**
 	 * @constructor Parser
@@ -5287,207 +5609,237 @@
 
 
 /***/ },
-/* 16 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	exports.ArrayNode = __webpack_require__(161);
-	exports.AssignmentNode = __webpack_require__(162);
-	exports.BlockNode = __webpack_require__(163);
-	exports.ConditionalNode = __webpack_require__(164);
-	exports.ConstantNode = __webpack_require__(165);
-	exports.IndexNode = __webpack_require__(167);
-	exports.FunctionAssignmentNode = __webpack_require__(166);
-	exports.FunctionNode = __webpack_require__(169);
-	exports.Node = __webpack_require__(173);
-	exports.OperatorNode = __webpack_require__(168);
-	exports.RangeNode = __webpack_require__(170);
-	exports.SymbolNode = __webpack_require__(171);
-	exports.UpdateNode = __webpack_require__(172);
-
-
-/***/ },
-/* 17 */
+/* 18 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// constants
-	exports.e = __webpack_require__(177);
-	exports.E = __webpack_require__(177);
-	exports['false'] = __webpack_require__(178);
-	exports.i = __webpack_require__(179);
-	exports['Infinity'] = __webpack_require__(180);
-	exports.LN2 = __webpack_require__(181);
-	exports.LN10 = __webpack_require__(182);
-	exports.LOG2E = __webpack_require__(183);
-	exports.LOG10E = __webpack_require__(184);
-	exports.NaN = __webpack_require__(185);
-	exports['null'] = __webpack_require__(186);
-	exports.pi = __webpack_require__(187);
-	exports.PI = __webpack_require__(187);
-	exports.phi = __webpack_require__(188);
-	exports.SQRT1_2 = __webpack_require__(189);
-	exports.SQRT2 = __webpack_require__(190);
-	exports.tau = __webpack_require__(191);
-	exports['true'] = __webpack_require__(192);
-	exports.version = __webpack_require__(193);
+	exports.e = __webpack_require__(185);
+	exports.E = __webpack_require__(185);
+	exports['false'] = __webpack_require__(186);
+	exports.i = __webpack_require__(187);
+	exports['Infinity'] = __webpack_require__(188);
+	exports.LN2 = __webpack_require__(189);
+	exports.LN10 = __webpack_require__(190);
+	exports.LOG2E = __webpack_require__(191);
+	exports.LOG10E = __webpack_require__(192);
+	exports.NaN = __webpack_require__(193);
+	exports['null'] = __webpack_require__(194);
+	exports.pi = __webpack_require__(195);
+	exports.PI = __webpack_require__(195);
+	exports.phi = __webpack_require__(196);
+	exports.SQRT1_2 = __webpack_require__(197);
+	exports.SQRT2 = __webpack_require__(198);
+	exports.tau = __webpack_require__(199);
+	exports['true'] = __webpack_require__(200);
+	exports.version = __webpack_require__(201);
 
 	// functions - arithmetic
-	exports.abs = __webpack_require__(197);
-	exports.add = __webpack_require__(198);
-	exports.ceil = __webpack_require__(199);
-	exports.cube = __webpack_require__(200);
-	exports.divide = __webpack_require__(201);
-	exports.dotDivide = __webpack_require__(202);
-	exports.dotMultiply = __webpack_require__(203);
-	exports.dotPow = __webpack_require__(204);
-	exports.exp = __webpack_require__(205);
-	exports.fix = __webpack_require__(206);
-	exports.floor = __webpack_require__(207);
-	exports.gcd = __webpack_require__(208);
-	exports.lcm = __webpack_require__(209);
-	exports.log = __webpack_require__(210);
-	exports.log10 = __webpack_require__(211);
-	exports.mod = __webpack_require__(212);
-	exports.multiply = __webpack_require__(213);
-	exports.norm = __webpack_require__(214);
-	exports.nthRoot = __webpack_require__(215);
-	exports.pow = __webpack_require__(216);
-	exports.round = __webpack_require__(217);
-	exports.sign = __webpack_require__(218);
-	exports.sqrt = __webpack_require__(219);
-	exports.square = __webpack_require__(220);
-	exports.subtract = __webpack_require__(221);
-	exports.unaryMinus = __webpack_require__(222);
-	exports.unaryPlus = __webpack_require__(223);
-	exports.xgcd = __webpack_require__(224);
+	exports.abs = __webpack_require__(206);
+	exports.add = __webpack_require__(207);
+	exports.ceil = __webpack_require__(208);
+	exports.cube = __webpack_require__(209);
+	exports.divide = __webpack_require__(210);
+	exports.dotDivide = __webpack_require__(211);
+	exports.dotMultiply = __webpack_require__(212);
+	exports.dotPow = __webpack_require__(213);
+	exports.exp = __webpack_require__(214);
+	exports.fix = __webpack_require__(215);
+	exports.floor = __webpack_require__(216);
+	exports.gcd = __webpack_require__(217);
+	exports.lcm = __webpack_require__(218);
+	exports.log = __webpack_require__(219);
+	exports.log10 = __webpack_require__(220);
+	exports.mod = __webpack_require__(221);
+	exports.multiply = __webpack_require__(222);
+	exports.norm = __webpack_require__(223);
+	exports.nthRoot = __webpack_require__(224);
+	exports.pow = __webpack_require__(225);
+	exports.round = __webpack_require__(226);
+	exports.sign = __webpack_require__(227);
+	exports.sqrt = __webpack_require__(228);
+	exports.square = __webpack_require__(229);
+	exports.subtract = __webpack_require__(230);
+	exports.unaryMinus = __webpack_require__(231);
+	exports.unaryPlus = __webpack_require__(232);
+	exports.xgcd = __webpack_require__(233);
 
 	// functions - bitwise
-	exports.bitAnd = __webpack_require__(225);
-	exports.bitNot = __webpack_require__(226);
-	exports.bitOr = __webpack_require__(227);
-	exports.bitXor = __webpack_require__(228);
-	exports.leftShift = __webpack_require__(229);
-	exports.rightArithShift = __webpack_require__(230);
-	exports.rightLogShift = __webpack_require__(231);
+	exports.bitAnd = __webpack_require__(234);
+	exports.bitNot = __webpack_require__(235);
+	exports.bitOr = __webpack_require__(236);
+	exports.bitXor = __webpack_require__(237);
+	exports.leftShift = __webpack_require__(238);
+	exports.rightArithShift = __webpack_require__(239);
+	exports.rightLogShift = __webpack_require__(240);
 
 	// functions - complex
-	exports.arg = __webpack_require__(232);
-	exports.conj = __webpack_require__(233);
-	exports.re = __webpack_require__(234);
-	exports.im = __webpack_require__(235);
+	exports.arg = __webpack_require__(241);
+	exports.conj = __webpack_require__(242);
+	exports.re = __webpack_require__(243);
+	exports.im = __webpack_require__(244);
 
 	// functions - construction
-	exports.bignumber = __webpack_require__(236);
-	exports['boolean'] = __webpack_require__(237);
-	exports.complex = __webpack_require__(238);
-	exports.index = __webpack_require__(239);
-	exports.matrix = __webpack_require__(240);
-	exports.number = __webpack_require__(241);
-	exports.string = __webpack_require__(242);
-	exports.unit = __webpack_require__(243);
+	exports.bignumber = __webpack_require__(245);
+	exports['boolean'] = __webpack_require__(246);
+	exports.complex = __webpack_require__(247);
+	exports.index = __webpack_require__(248);
+	exports.matrix = __webpack_require__(249);
+	exports.number = __webpack_require__(250);
+	exports.string = __webpack_require__(251);
+	exports.unit = __webpack_require__(252);
 
 	// functions - expression
-	exports['eval'] =  __webpack_require__(244);
-	exports.help =  __webpack_require__(245);
+	exports['eval'] =  __webpack_require__(253);
+	exports.help =  __webpack_require__(254);
 
 	// functions - logical
-	exports['and'] = __webpack_require__(246);
-	exports['not'] = __webpack_require__(247);
-	exports['or'] = __webpack_require__(248);
-	exports['xor'] = __webpack_require__(249);
+	exports['and'] = __webpack_require__(255);
+	exports['not'] = __webpack_require__(256);
+	exports['or'] = __webpack_require__(257);
+	exports['xor'] = __webpack_require__(258);
 
 	// functions - matrix
-	exports['concat'] = __webpack_require__(250);
-	exports.cross = __webpack_require__(251);
-	exports.det = __webpack_require__(252);
-	exports.diag = __webpack_require__(253);
-	exports.dot = __webpack_require__(254);
-	exports.eye = __webpack_require__(255);
-	exports.flatten = __webpack_require__(256);
-	exports.inv = __webpack_require__(257);
-	exports.ones = __webpack_require__(258);
-	exports.range = __webpack_require__(259);
-	exports.resize = __webpack_require__(260);
-	exports.size = __webpack_require__(261);
-	exports.squeeze = __webpack_require__(262);
-	exports.subset = __webpack_require__(263);
-	exports.transpose = __webpack_require__(264);
-	exports.zeros = __webpack_require__(265);
+	exports['concat'] = __webpack_require__(259);
+	exports.cross = __webpack_require__(260);
+	exports.det = __webpack_require__(261);
+	exports.diag = __webpack_require__(262);
+	exports.dot = __webpack_require__(263);
+	exports.eye = __webpack_require__(264);
+	exports.flatten = __webpack_require__(265);
+	exports.inv = __webpack_require__(266);
+	exports.ones = __webpack_require__(267);
+	exports.range = __webpack_require__(268);
+	exports.resize = __webpack_require__(269);
+	exports.size = __webpack_require__(270);
+	exports.squeeze = __webpack_require__(271);
+	exports.subset = __webpack_require__(272);
+	exports.trace = __webpack_require__(273);
+	exports.transpose = __webpack_require__(274);
+	exports.zeros = __webpack_require__(275);
 
 	// functions - probability
-	exports.combinations = __webpack_require__(266);
+	exports.combinations = __webpack_require__(276);
 	//exports.distribution = require('./function/probability/distribution');
-	exports.factorial = __webpack_require__(267);
-	exports.gamma = __webpack_require__(268);
-	exports.permutations = __webpack_require__(269);
-	exports.pickRandom = __webpack_require__(270);
-	exports.random = __webpack_require__(271);
-	exports.randomInt = __webpack_require__(272);
+	exports.factorial = __webpack_require__(277);
+	exports.gamma = __webpack_require__(278);
+	exports.permutations = __webpack_require__(279);
+	exports.pickRandom = __webpack_require__(280);
+	exports.random = __webpack_require__(281);
+	exports.randomInt = __webpack_require__(282);
 
 	// functions - relational
-	exports.compare = __webpack_require__(273);
-	exports.deepEqual = __webpack_require__(274);
-	exports['equal'] = __webpack_require__(275);
-	exports.larger = __webpack_require__(276);
-	exports.largerEq = __webpack_require__(277);
-	exports.smaller = __webpack_require__(278);
-	exports.smallerEq = __webpack_require__(279);
-	exports.unequal = __webpack_require__(280);
+	exports.compare = __webpack_require__(283);
+	exports.deepEqual = __webpack_require__(284);
+	exports['equal'] = __webpack_require__(285);
+	exports.larger = __webpack_require__(286);
+	exports.largerEq = __webpack_require__(287);
+	exports.smaller = __webpack_require__(288);
+	exports.smallerEq = __webpack_require__(289);
+	exports.unequal = __webpack_require__(290);
 
 	// functions - statistics
-	exports.max = __webpack_require__(281);
-	exports.mean = __webpack_require__(282);
-	exports.median = __webpack_require__(283);
-	exports.min = __webpack_require__(284);
-	exports.prod = __webpack_require__(285);
-	exports.std = __webpack_require__(286);
-	exports.sum = __webpack_require__(287);
-	exports['var'] = __webpack_require__(288);
+	exports.max = __webpack_require__(291);
+	exports.mean = __webpack_require__(292);
+	exports.median = __webpack_require__(293);
+	exports.min = __webpack_require__(294);
+	exports.prod = __webpack_require__(295);
+	exports.std = __webpack_require__(296);
+	exports.sum = __webpack_require__(297);
+	exports['var'] = __webpack_require__(298);
 
 	// functions - trigonometry
-	exports.acos = __webpack_require__(289);
-	exports.asin = __webpack_require__(290);
-	exports.atan = __webpack_require__(291);
-	exports.atan2 = __webpack_require__(292);
-	exports.cos = __webpack_require__(293);
-	exports.cosh = __webpack_require__(294);
-	exports.cot = __webpack_require__(295);
-	exports.coth = __webpack_require__(296);
-	exports.csc = __webpack_require__(297);
-	exports.csch = __webpack_require__(298);
-	exports.sec = __webpack_require__(299);
-	exports.sech = __webpack_require__(300);
-	exports.sin = __webpack_require__(301);
-	exports.sinh = __webpack_require__(302);
-	exports.tan = __webpack_require__(303);
-	exports.tanh = __webpack_require__(304);
+	exports.acos = __webpack_require__(299);
+	exports.acosh = __webpack_require__(300);
+	exports.acot = __webpack_require__(301);
+	exports.acoth = __webpack_require__(302);
+	exports.acsc = __webpack_require__(303);
+	exports.acsch = __webpack_require__(304);
+	exports.asec = __webpack_require__(305);
+	exports.asech = __webpack_require__(306);
+	exports.asin = __webpack_require__(307);
+	exports.asinh = __webpack_require__(308);
+	exports.atan = __webpack_require__(309);
+	exports.atanh = __webpack_require__(310);
+	exports.atan2 = __webpack_require__(311);
+	exports.cos = __webpack_require__(312);
+	exports.cosh = __webpack_require__(313);
+	exports.cot = __webpack_require__(314);
+	exports.coth = __webpack_require__(315);
+	exports.csc = __webpack_require__(316);
+	exports.csch = __webpack_require__(317);
+	exports.sec = __webpack_require__(318);
+	exports.sech = __webpack_require__(319);
+	exports.sin = __webpack_require__(320);
+	exports.sinh = __webpack_require__(321);
+	exports.tan = __webpack_require__(322);
+	exports.tanh = __webpack_require__(323);
 
 	// functions - units
-	exports.to = __webpack_require__(305);
+	exports.to = __webpack_require__(324);
 
 	// functions - utils
-	exports.clone =  __webpack_require__(306);
-	exports.map =  __webpack_require__(307);
-	exports.filter =  __webpack_require__(308);
-	exports.forEach =  __webpack_require__(309);
-	exports.format =  __webpack_require__(310);
+	exports.clone =  __webpack_require__(325);
+	exports.map =  __webpack_require__(326);
+	exports.filter =  __webpack_require__(327);
+	exports.forEach =  __webpack_require__(328);
+	exports.format =  __webpack_require__(329);
 	// exports.print =  require('./function/utils/print'); // TODO: add documentation for print as soon as the parser supports objects.
-	exports['import'] =  __webpack_require__(311);
-	exports.sort =  __webpack_require__(312);
-	exports['typeof'] =  __webpack_require__(313);
-
-
-/***/ },
-/* 18 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	var BigNumber = __webpack_require__(159);
-	var errorTransform = __webpack_require__(174).transform;
-	var isNumber = __webpack_require__(4).isNumber;
-	var argsToArray = __webpack_require__(153).argsToArray;
+	exports['import'] =  __webpack_require__(330);
+	exports.sort =  __webpack_require__(331);
+	exports['typeof'] =  __webpack_require__(332);
+
+
+/***/ },
+/* 19 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var BigNumber = __webpack_require__(5);
+	var Complex   = __webpack_require__(7);
+	var Help      = __webpack_require__(12);
+	var Index     = __webpack_require__(9);
+	var Matrix    = __webpack_require__(10);
+	var Range     = __webpack_require__(8);
+	var ResultSet = __webpack_require__(13);
+	var Unit      = __webpack_require__(11);
+
+	/**
+	 * Instantiate mathjs data types from their JSON representation
+	 * @param {string} key
+	 * @param {*} value
+	 * @returns {*} Returns the revived object
+	 */
+	function reviver(key, value) {
+	  var type = value && value.mathjs;
+
+	  switch (type) {
+	    case 'BigNumber': return BigNumber.fromJSON(value);
+	    case 'Complex':   return Complex.fromJSON(value);
+	    case 'Help':      return Help.fromJSON(value);
+	    case 'Index':     return Index.fromJSON(value);
+	    case 'Matrix':    return Matrix.fromJSON(value);
+	    case 'Range':     return Range.fromJSON(value);
+	    case 'ResultSet': return ResultSet.fromJSON(value);
+	    case 'Unit':      return Unit.fromJSON(value);
+	  }
+
+	  return value;
+	}
+
+	module.exports = reviver;
+
+
+/***/ },
+/* 20 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var BigNumber = __webpack_require__(5);
+	var errorTransform = __webpack_require__(203).transform;
+	var isNumber = __webpack_require__(3).isNumber;
+	var argsToArray = __webpack_require__(165).argsToArray;
 
 	/**
 	 * Attach a transform function to math.range
@@ -5498,7 +5850,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.concat.transform = function () {
+	  var transform = function () {
 	    // copy arguments into an array
 	    var args = argsToArray(arguments);
 
@@ -5519,19 +5871,23 @@
 	      throw errorTransform(err);
 	    }
 	  };
+
+	  math.concat.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 19 */
+/* 21 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var SymbolNode = __webpack_require__(171);
-	var isBoolean = __webpack_require__(175).isBoolean;
-	var argsToArray = __webpack_require__(153).argsToArray;
-	var ArgumentsError = __webpack_require__(155);
+	var SymbolNode = __webpack_require__(183);
+	var isBoolean = __webpack_require__(204).isBoolean;
+	var argsToArray = __webpack_require__(165).argsToArray;
+	var ArgumentsError = __webpack_require__(167);
 
 	/**
 	 * Attach a transform function to math.filter
@@ -5544,7 +5900,7 @@
 	module.exports = function (math) {
 	  var _filter = math.filter;
 
-	  _filter.transform = function (args, math, scope) {
+	  var transform = function (args, math, scope) {
 	    if (args.length !== 2) {
 	      throw new ArgumentsError('filter', arguments.length, 2);
 	    }
@@ -5585,17 +5941,20 @@
 	    return _filter(x, test);
 	  };
 
-	  math.filter.transform.rawArgs = true;
+	  transform.rawArgs = true;
+	  math.filter.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 20 */
+/* 22 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var Matrix = __webpack_require__(9);
+	var Matrix = __webpack_require__(10);
 
 	/**
 	 * Attach a transform function to math.forEach
@@ -5605,7 +5964,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.forEach.transform = function (x, callback) {
+	  var transform = function (x, callback) {
 	    if (arguments.length != 2) {
 	      throw new math.error.ArgumentsError('forEach', arguments.length, 2);
 	    }
@@ -5634,20 +5993,23 @@
 	    recurse(array, []);
 	  }
 
+	  math.forEach.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 21 */
+/* 23 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var BigNumber = __webpack_require__(159);
-	var Range = __webpack_require__(7);
-	var Index = __webpack_require__(8);
-	var Matrix = __webpack_require__(9);
-	var isNumber = __webpack_require__(4).isNumber;
+	var BigNumber = __webpack_require__(5);
+	var Range = __webpack_require__(8);
+	var Index = __webpack_require__(9);
+	var Matrix = __webpack_require__(10);
+	var isNumber = __webpack_require__(3).isNumber;
 	var isArray = Array.isArray;
 
 	/**
@@ -5658,7 +6020,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.index.transform = function () {
+	  var transform = function () {
 	    var args = [];
 	    for (var i = 0, ii = arguments.length; i < ii; i++) {
 	      var arg = arguments[i];
@@ -5685,20 +6047,24 @@
 	    Index.apply(res, args);
 	    return res;
 	  };
+
+	  math.index.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 22 */
+/* 24 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var Matrix = __webpack_require__(9);
-	var BigNumber = __webpack_require__(159);
-	var Range = __webpack_require__(7);
-	var Index = __webpack_require__(8);
-	var isNumber = __webpack_require__(4).isNumber;
+	var Matrix = __webpack_require__(10);
+	var BigNumber = __webpack_require__(5);
+	var Range = __webpack_require__(8);
+	var Index = __webpack_require__(9);
+	var isNumber = __webpack_require__(3).isNumber;
 	var isArray = Array.isArray;
 
 	/**
@@ -5709,7 +6075,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.map.transform = function (x, callback) {
+	  var transform = function (x, callback) {
 	    if (arguments.length != 2) {
 	      throw new math.error.ArgumentsError('map', arguments.length, 2);
 	    }
@@ -5738,20 +6104,24 @@
 
 	    return recurse(arrayIn, []);
 	  }
+
+	  math.map.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 23 */
+/* 25 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var BigNumber = __webpack_require__(159);
-	var errorTransform = __webpack_require__(174).transform;
-	var isNumber = __webpack_require__(4).isNumber;
-	var isCollection = __webpack_require__(13).isCollection;
-	var argsToArray = __webpack_require__(153).argsToArray;
+	var BigNumber = __webpack_require__(5);
+	var errorTransform = __webpack_require__(203).transform;
+	var isNumber = __webpack_require__(3).isNumber;
+	var isCollection = __webpack_require__(14).isCollection;
+	var argsToArray = __webpack_require__(165).argsToArray;
 
 	/**
 	 * Attach a transform function to math.max
@@ -5762,7 +6132,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.max.transform = function () {
+	  var transform = function () {
 	    var args = argsToArray(arguments);
 
 	    // change last argument dim from one-based to zero-based
@@ -5783,20 +6153,24 @@
 	      throw errorTransform(err);
 	    }
 	  };
+
+	  math.max.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 24 */
+/* 26 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var BigNumber = __webpack_require__(159);
-	var errorTransform = __webpack_require__(174).transform;
-	var isNumber = __webpack_require__(4).isNumber;
-	var isCollection = __webpack_require__(13).isCollection;
-	var argsToArray = __webpack_require__(153).argsToArray;
+	var BigNumber = __webpack_require__(5);
+	var errorTransform = __webpack_require__(203).transform;
+	var isNumber = __webpack_require__(3).isNumber;
+	var isCollection = __webpack_require__(14).isCollection;
+	var argsToArray = __webpack_require__(165).argsToArray;
 
 	/**
 	 * Attach a transform function to math.mean
@@ -5807,7 +6181,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.mean.transform = function () {
+	  var transform = function () {
 	    var args = argsToArray(arguments);
 
 	    // change last argument dim from one-based to zero-based
@@ -5828,20 +6202,24 @@
 	      throw errorTransform(err);
 	    }
 	  };
+
+	  math.mean.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 25 */
+/* 27 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var BigNumber = __webpack_require__(159);
-	var errorTransform = __webpack_require__(174).transform;
-	var isNumber = __webpack_require__(4).isNumber;
-	var isCollection = __webpack_require__(13).isCollection;
-	var argsToArray = __webpack_require__(153).argsToArray;
+	var BigNumber = __webpack_require__(5);
+	var errorTransform = __webpack_require__(203).transform;
+	var isNumber = __webpack_require__(3).isNumber;
+	var isCollection = __webpack_require__(14).isCollection;
+	var argsToArray = __webpack_require__(165).argsToArray;
 
 	/**
 	 * Attach a transform function to math.min
@@ -5852,7 +6230,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.min.transform = function () {
+	  var transform = function () {
 	    var args = argsToArray(arguments);
 
 	    // change last argument dim from one-based to zero-based
@@ -5873,17 +6251,21 @@
 	      throw errorTransform(err);
 	    }
 	  };
+
+	  math.min.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 26 */
+/* 28 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var isBoolean = __webpack_require__(175).isBoolean;
-	var argsToArray = __webpack_require__(153).argsToArray;
+	var isBoolean = __webpack_require__(204).isBoolean;
+	var argsToArray = __webpack_require__(165).argsToArray;
 
 	/**
 	 * Attach a transform function to math.range
@@ -5893,7 +6275,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.range.transform = function () {
+	  var transform = function () {
 	    var args = argsToArray(arguments);
 
 	    var lastIndex = args.length - 1;
@@ -5904,18 +6286,22 @@
 
 	    return math.range.apply(math, args);
 	  };
+
+	  math.range.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 27 */
+/* 29 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var errorTransform = __webpack_require__(174).transform;
-	var isBoolean = __webpack_require__(175).isBoolean;
-	var argsToArray = __webpack_require__(153).argsToArray;
+	var errorTransform = __webpack_require__(203).transform;
+	var isBoolean = __webpack_require__(204).isBoolean;
+	var argsToArray = __webpack_require__(165).argsToArray;
 
 	/**
 	 * Attach a transform function to math.subset
@@ -5925,7 +6311,7 @@
 	 * @param {Object} math
 	 */
 	module.exports = function (math) {
-	  math.subset.transform = function () {
+	  var transform = function () {
 	    try {
 	      return math.subset.apply(math, argsToArray(arguments));
 	    }
@@ -5933,17 +6319,21 @@
 	      throw errorTransform(err);
 	    }
 	  };
+
+	  math.subset.transform = transform;
+
+	  return transform;
 	};
 
 
 /***/ },
-/* 28 */
+/* 30 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var string = __webpack_require__(176);
+	  var string = __webpack_require__(205);
 
 	  /**
 	   * @constructor Chain
@@ -6038,16 +6428,16 @@
 
 
 /***/ },
-/* 29 */
+/* 31 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
-	      _parse = __webpack_require__(14),
+	  var util = __webpack_require__(171),
+	      _parse = __webpack_require__(16),
 
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isString = util.string.isString,
 	      isCollection = collection.isCollection;
@@ -6110,16 +6500,16 @@
 
 
 /***/ },
-/* 30 */
+/* 32 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-	      _parse = __webpack_require__(14),
+	  var util = __webpack_require__(171),
+	      _parse = __webpack_require__(16),
 
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isString = util.string.isString,
 	      isCollection = collection.isCollection;
@@ -6183,13 +6573,13 @@
 
 
 /***/ },
-/* 31 */
+/* 33 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Help = __webpack_require__(11);
+	  var Help = __webpack_require__(12);
 
 	  /**
 	   * Retrieve help on a function or data type.
@@ -6250,19 +6640,19 @@
 	    } else if (!doc) {
 	      throw new Error('No documentation found on "' + text + '"');
 	    }
-	    return new Help(math, doc);
+	    return new Help(doc);
 	  };
 	};
 
 
 /***/ },
-/* 32 */
+/* 34 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var _parse = __webpack_require__(14);
+	  var _parse = __webpack_require__(16);
 
 	  /**
 	   * Parse an expression. Returns a node tree, which can be evaluated by
@@ -6304,18 +6694,18 @@
 
 
 /***/ },
-/* 33 */
+/* 35 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -6356,7 +6746,15 @@
 	    }
 
 	    if (isComplex(x)) {
-	      return Math.sqrt(x.re * x.re + x.im * x.im);
+	      // do not compute sqrt(re * re + im * im) since it will overflow with big numbers!
+	      var re = Math.abs(x.re);
+	      var im = Math.abs(x.im);
+	      if (re >= im) {
+	        var x = im / re;
+	        return re * Math.sqrt(1 + x * x);
+	      }
+	      var y = re / im;
+	      return im * Math.sqrt(1 + y * y);
 	    }
 
 	    if (x instanceof BigNumber) {
@@ -6377,19 +6775,19 @@
 
 
 /***/ },
-/* 34 */
+/* 36 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isNumber = util.number.isNumber,
@@ -6539,17 +6937,17 @@
 
 
 /***/ },
-/* 35 */
+/* 37 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -6618,17 +7016,17 @@
 
 
 /***/ },
-/* 36 */
+/* 38 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -6690,18 +7088,18 @@
 
 
 /***/ },
-/* 37 */
+/* 39 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function(math) {
-	  var util = __webpack_require__(160);
+	  var util = __webpack_require__(171);
 
 	  var BigNumber = math.type.BigNumber;
-	  var Complex = __webpack_require__(6);
-	  var Matrix = __webpack_require__(9);
-	  var Unit = __webpack_require__(10);
+	  var Complex = __webpack_require__(7);
+	  var Matrix = __webpack_require__(10);
+	  var Unit = __webpack_require__(11);
 
 	  var isNumber = util.number.isNumber;
 	  var isBoolean = util['boolean'].isBoolean;
@@ -6823,13 +7221,13 @@
 
 
 /***/ },
-/* 38 */
+/* 40 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function(math) {
-	  var collection = __webpack_require__(13);
+	  var collection = __webpack_require__(14);
 	  var isCollection = collection.isCollection;
 
 	  /**
@@ -6894,13 +7292,13 @@
 
 
 /***/ },
-/* 39 */
+/* 41 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var collection = __webpack_require__(13);
+	  var collection = __webpack_require__(14);
 
 	  /**
 	   * Divide two matrices element wise. The function accepts both matrices and
@@ -6944,14 +7342,14 @@
 
 
 /***/ },
-/* 40 */
+/* 42 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-	      collection = __webpack_require__(13);
+	  var util = __webpack_require__(171),
+	      collection = __webpack_require__(14);
 
 	  /**
 	   * Multiply two matrices element wise. The function accepts both matrices and
@@ -6995,14 +7393,14 @@
 
 
 /***/ },
-/* 41 */
+/* 43 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-	      collection = __webpack_require__(13);
+	  var util = __webpack_require__(171),
+	      collection = __webpack_require__(14);
 
 	  /**
 	   * Calculates the power of x to y element wise.
@@ -7043,18 +7441,18 @@
 
 
 /***/ },
-/* 42 */
+/* 44 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7124,17 +7522,17 @@
 
 
 /***/ },
-/* 43 */
+/* 45 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7202,17 +7600,17 @@
 
 
 /***/ },
-/* 44 */
+/* 46 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7280,16 +7678,16 @@
 
 
 /***/ },
-/* 45 */
+/* 47 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7427,16 +7825,16 @@
 
 
 /***/ },
-/* 46 */
+/* 48 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7589,17 +7987,17 @@
 
 
 /***/ },
-/* 47 */
+/* 49 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7692,17 +8090,17 @@
 
 
 /***/ },
-/* 48 */
+/* 50 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7780,16 +8178,16 @@
 
 
 /***/ },
-/* 49 */
+/* 51 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -7919,19 +8317,19 @@
 
 
 /***/ },
-/* 50 */
+/* 52 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function(math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      array = util.array,
 	      isNumber = util.number.isNumber,
@@ -8350,20 +8748,20 @@
 
 
 /***/ },
-/* 51 */
+/* 53 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	    array = __webpack_require__(153),
+	    array = __webpack_require__(165),
 
 	    BigNumber = math.type.BigNumber,
-	    Complex = __webpack_require__(6),
-	    Matrix = __webpack_require__(9),
-	    collection = __webpack_require__(13),
+	    Complex = __webpack_require__(7),
+	    Matrix = __webpack_require__(10),
+	    collection = __webpack_require__(14),
 
 	    isNumber = util.number.isNumber,
 	    isBoolean = util['boolean'].isBoolean,
@@ -8419,8 +8817,15 @@
 	    }
 
 	    if (isComplex(x)) {
-	      // ignore p, complex numbers
-	      return Math.sqrt(x.re * x.re + x.im * x.im);
+	      // do not compute sqrt(re * re + im * im) since it will overflow with big numbers!
+	      var re = Math.abs(x.re);
+	      var im = Math.abs(x.im);
+	      if (re >= im) {
+	        var x = im / re;
+	        return re * Math.sqrt(1 + x * x);
+	      }
+	      var y = re / im;
+	      return im * Math.sqrt(1 + y * y);
 	    }
 
 	    if (x instanceof BigNumber) {
@@ -8538,16 +8943,16 @@
 
 
 /***/ },
-/* 52 */
+/* 54 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160);
+	  var util = __webpack_require__(171);
 
 	  var BigNumber = math.type.BigNumber;
-	  var collection = __webpack_require__(13);
+	  var collection = __webpack_require__(14);
 
 	  var isNumber = util.number.isNumber;
 	  var isBoolean = util['boolean'].isBoolean;
@@ -8737,18 +9142,18 @@
 
 
 /***/ },
-/* 53 */
+/* 55 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      array = util.array,
 	      isNumber = util.number.isNumber,
@@ -8921,17 +9326,17 @@
 
 
 /***/ },
-/* 54 */
+/* 56 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isInteger = util.number.isInteger,
@@ -9061,17 +9466,17 @@
 
 
 /***/ },
-/* 55 */
+/* 57 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      number = util.number,
 	      isNumber = util.number.isNumber,
@@ -9141,17 +9546,17 @@
 
 
 /***/ },
-/* 56 */
+/* 58 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -9247,17 +9652,17 @@
 
 
 /***/ },
-/* 57 */
+/* 59 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -9321,19 +9726,19 @@
 
 
 /***/ },
-/* 58 */
+/* 60 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isNumber = util.number.isNumber,
@@ -9481,18 +9886,18 @@
 
 
 /***/ },
-/* 59 */
+/* 61 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -9570,18 +9975,18 @@
 
 
 /***/ },
-/* 60 */
+/* 62 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -9650,15 +10055,15 @@
 
 
 /***/ },
-/* 61 */
+/* 63 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	      Matrix = __webpack_require__(9),
+	      Matrix = __webpack_require__(10),
 	      BigNumber = math.type.BigNumber,
 
 	      isNumber = util.number.isNumber,
@@ -9832,18 +10237,18 @@
 
 
 /***/ },
-/* 62 */
+/* 64 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -9931,18 +10336,18 @@
 
 
 /***/ },
-/* 63 */
+/* 65 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -10004,18 +10409,18 @@
 
 
 /***/ },
-/* 64 */
+/* 66 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -10104,18 +10509,18 @@
 
 
 /***/ },
-/* 65 */
+/* 67 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -10203,18 +10608,18 @@
 
 
 /***/ },
-/* 66 */
+/* 68 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -10325,18 +10730,18 @@
 
 
 /***/ },
-/* 67 */
+/* 69 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -10449,17 +10854,17 @@
 
 
 /***/ },
-/* 68 */
+/* 70 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	      Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isInteger = util.number.isInteger,
@@ -10519,17 +10924,17 @@
 
 
 /***/ },
-/* 69 */
+/* 71 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -10596,17 +11001,17 @@
 
 
 /***/ },
-/* 70 */
+/* 72 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      object = util.object,
 	      isNumber = util.number.isNumber,
@@ -10671,17 +11076,17 @@
 
 
 /***/ },
-/* 71 */
+/* 73 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      object = util.object,
 	      isNumber = util.number.isNumber,
@@ -10748,17 +11153,17 @@
 
 
 /***/ },
-/* 72 */
+/* 74 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -10824,17 +11229,17 @@
 
 
 /***/ },
-/* 73 */
+/* 75 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      // take the BigNumber instance the provided math.js instance
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
 	      isNumber = util.number.isNumber,
@@ -10893,16 +11298,16 @@
 
 
 /***/ },
-/* 74 */
+/* 76 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
 	      isNumber = util.number.isNumber,
@@ -10987,17 +11392,17 @@
 
 
 /***/ },
-/* 75 */
+/* 77 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
 	      isNumber = util.number.isNumber,
@@ -11120,16 +11525,16 @@
 
 
 /***/ },
-/* 76 */
+/* 78 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Index = __webpack_require__(8);
+	      Index = __webpack_require__(9);
 
 	  /**
 	   * Create an index. An Index can store ranges having start, step, and end
@@ -11194,14 +11599,14 @@
 
 
 /***/ },
-/* 77 */
+/* 79 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-	      Matrix = __webpack_require__(9);
+	  var util = __webpack_require__(171),
+	      Matrix = __webpack_require__(10);
 
 	  /**
 	   * Create a Matrix. The function creates a new `math.type.Matrix` object from
@@ -11239,17 +11644,17 @@
 
 
 /***/ },
-/* 78 */
+/* 80 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160);
+	  var util = __webpack_require__(171);
 
 	  var BigNumber = math.type.BigNumber;
 	  var Unit = math.type.Unit;
-	  var collection = __webpack_require__(13);
+	  var collection = __webpack_require__(14);
 
 	  var isCollection = collection.isCollection;
 	  var isNumber = util.number.isNumber;
@@ -11336,13 +11741,13 @@
 
 
 /***/ },
-/* 79 */
+/* 81 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Parser = __webpack_require__(15);
+	  var Parser = __webpack_require__(17);
 
 	  /**
 	   * Create a parser. The function creates a new `math.expression.Parser` object.
@@ -11394,7 +11799,7 @@
 
 
 /***/ },
-/* 80 */
+/* 82 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -11428,7 +11833,7 @@
 	   *         .done();     // 5
 	   *
 	   *     math.chain( [[1, 2], [3, 4]] )
-	   *         .set([1, 1], 8)
+	   *         .subset(math.index(0, 0), 8)
 	   *         .multiply(3)
 	   *         .done();     // [[24, 6], [9, 12]]
 	   *
@@ -11457,15 +11862,15 @@
 
 
 /***/ },
-/* 81 */
+/* 83 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      number = util.number,
 	      isNumber = util.number.isNumber,
@@ -11524,17 +11929,17 @@
 
 
 /***/ },
-/* 82 */
+/* 84 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
 	      isString = util.string.isString;
@@ -11611,18 +12016,18 @@
 
 
 /***/ },
-/* 83 */
+/* 85 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -11723,18 +12128,18 @@
 
 
 /***/ },
-/* 84 */
+/* 86 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -11798,18 +12203,18 @@
 
 
 /***/ },
-/* 85 */
+/* 87 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -11904,18 +12309,18 @@
 
 
 /***/ },
-/* 86 */
+/* 88 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -11992,23 +12397,23 @@
 
 
 /***/ },
-/* 87 */
+/* 89 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-
-	      BigNumber = __webpack_require__(159),
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
-
-	      object = util.object,
-	      array = util.array,
-	      isNumber = util.number.isNumber,
-	      isInteger = util.number.isInteger,
-	      isCollection = collection.isCollection;
+	  var util = __webpack_require__(171);
+
+	  var BigNumber = __webpack_require__(5);
+	  var Matrix = __webpack_require__(10);
+	  var collection = __webpack_require__(14);
+
+	  var object = util.object;
+	  var array = util.array;
+	  var isNumber = util.number.isNumber;
+	  var isInteger = util.number.isInteger;
+	  var isCollection = collection.isCollection;
 
 	  /**
 	   * Concatenate two or more matrices.
@@ -12134,14 +12539,14 @@
 
 
 /***/ },
-/* 88 */
+/* 90 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function(math) {
-	  var array = __webpack_require__(153);
-	  var Matrix = __webpack_require__(9);
+	  var array = __webpack_require__(165);
+	  var Matrix = __webpack_require__(10);
 
 	  /**
 	   * Calculate the cross product for two vectors in three dimensional space.
@@ -12219,15 +12624,15 @@
 
 
 /***/ },
-/* 89 */
+/* 91 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	      Matrix = __webpack_require__(9),
+	      Matrix = __webpack_require__(10),
 
 	      object = util.object,
 	      string = util.string;
@@ -12380,16 +12785,16 @@
 
 
 /***/ },
-/* 90 */
+/* 92 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
+	      Matrix = __webpack_require__(10),
 
 	      object = util.object,
 	      isArray = util.array.isArray,
@@ -12497,14 +12902,14 @@
 
 
 /***/ },
-/* 91 */
+/* 93 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function(math) {
-	  var array = __webpack_require__(153);
-	  var Matrix = __webpack_require__(9);
+	  var array = __webpack_require__(165);
+	  var Matrix = __webpack_require__(10);
 
 	  /**
 	   * Calculate the dot product of two vectors. The dot product of
@@ -12578,17 +12983,17 @@
 
 
 /***/ },
-/* 92 */
+/* 94 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isInteger = util.number.isInteger,
@@ -12681,15 +13086,15 @@
 
 
 /***/ },
-/* 93 */
+/* 95 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160);
+	  var util = __webpack_require__(171);
 
-	  var Matrix = __webpack_require__(9);
+	  var Matrix = __webpack_require__(10);
 
 	  var object = util.object;
 	  var array = util.array;
@@ -12734,14 +13139,14 @@
 
 
 /***/ },
-/* 94 */
+/* 96 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160);
-	  var Matrix = __webpack_require__(9);
+	  var util = __webpack_require__(171);
+	  var Matrix = __webpack_require__(10);
 
 	  /**
 	   * Calculate the inverse of a square matrix.
@@ -12932,17 +13337,17 @@
 
 
 /***/ },
-/* 95 */
+/* 97 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      array = util.array,
 
@@ -13009,17 +13414,17 @@
 
 
 /***/ },
-/* 96 */
+/* 98 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isString = util.string.isString,
@@ -13335,16 +13740,16 @@
 
 
 /***/ },
-/* 97 */
+/* 99 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
+	      Matrix = __webpack_require__(10),
 
 	      array = util.array,
 	      clone = util.object.clone,
@@ -13470,18 +13875,18 @@
 
 
 /***/ },
-/* 98 */
+/* 100 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      Matrix = __webpack_require__(9),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      Matrix = __webpack_require__(10),
 
 	      array = util.array,
 	      isNumber = util.number.isNumber,
@@ -13543,15 +13948,15 @@
 
 
 /***/ },
-/* 99 */
+/* 101 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	      Matrix = __webpack_require__(9),
+	      Matrix = __webpack_require__(10),
 
 	      object = util.object,
 	      array = util.array,
@@ -13607,16 +14012,16 @@
 
 
 /***/ },
-/* 100 */
+/* 102 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
-	      Matrix = __webpack_require__(9),
-	      Index = __webpack_require__(8),
+	      Matrix = __webpack_require__(10),
+	      Index = __webpack_require__(9),
 
 	      array = util.array,
 	      isString = util.string.isString,
@@ -13824,15 +14229,123 @@
 
 
 /***/ },
-/* 101 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-
-	      Matrix = __webpack_require__(9),
+/* 103 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      Matrix = __webpack_require__(10),
+
+	      object = util.object,
+	      string = util.string;
+
+	  /**
+	   * Calculate the trace of a matrix: the sum of the elements on the main
+	   * diagonal of a square matrix.
+	   *
+	   * Syntax:
+	   *
+	   *    math.trace(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.trace([[1, 2], [3, 4]]); // returns 5
+	   *
+	   *    var A = [
+	   *      [1, 2, 3],
+	   *      [-1, 2, 3],
+	   *      [2, 0, 3]
+	   *    ]
+	   *    math.trace(A); // returns 6
+	   *
+	   * See also:
+	   *
+	   *    diag
+	   *
+	   * @param {Array | Matrix} x  A matrix
+	   * @return {Number} The trace of `x`
+	   */
+	  math.trace = function trace (x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('trace', arguments.length, 1);
+	    }
+
+	    var size;
+	    if (x instanceof Matrix) {
+	      size = x.size();
+	    }
+	    else if (x instanceof Array) {
+	      x = new Matrix(x);
+	      size = x.size();
+	    }
+	    else {
+	      // a scalar
+	      size = [];
+	    }
+
+	    switch (size.length) {
+	      case 0:
+	        // scalar
+	        return object.clone(x);
+
+	      case 1:
+	        // vector
+	        if (size[0] == 1) {
+	          return object.clone(x.valueOf()[0]);
+	        }
+	        else {
+	          throw new RangeError('Matrix must be square ' +
+	              '(size: ' + string.format(size) + ')');
+	        }
+
+	      case 2:
+	        // two dimensional array
+	        var rows = size[0];
+	        var cols = size[1];
+	        if (rows == cols) {
+	          return _trace(x.clone().valueOf());
+	        }
+	        else {
+	          throw new RangeError('Matrix must be square ' +
+	              '(size: ' + string.format(size) + ')');
+	        }
+
+	      default:
+	        // multi dimensional array
+	        throw new RangeError('Matrix must be two dimensional ' +
+	            '(size: ' + string.format(size) + ')');
+	    }
+	  };
+
+	  /**
+	   * Calculate the trace of a matrix
+	   * @param {Array[]} matrix  A square, two dimensional matrix
+	   * @returns {Number} trace
+	   * @private
+	   */
+	  function _trace (matrix) {
+	    var sum = 0;
+	    for (var i = 0; i < matrix.length; i++) {
+	        sum = math.add(sum, matrix[i][i]);
+	    }
+	    return sum;
+	  }
+	};
+
+
+/***/ },
+/* 104 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      Matrix = __webpack_require__(10),
 
 	      object = util.object,
 	      string = util.string;
@@ -13907,17 +14420,17 @@
 
 
 /***/ },
-/* 102 */
+/* 105 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	      Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      array = util.array,
 	      isArray = Array.isArray;
@@ -13983,16 +14496,16 @@
 
 
 /***/ },
-/* 103 */
+/* 106 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	module.exports = function (math, config) {
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
@@ -14022,42 +14535,56 @@
 	   * @return {Number | BigNumber | Array | Matrix}    The factorial of `n`
 	   */
 	  math.factorial = function factorial (n) {
-	    var value, res;
+	    var value, res, preciseFacs;
 
 	    if (arguments.length != 1) {
 	      throw new math.error.ArgumentsError('factorial', arguments.length, 1);
 	    }
 
 	    if (isNumber(n)) {
-	      return math.gamma(n + 1);
+	      return n !== Number.POSITIVE_INFINITY
+	        ? math.gamma(n + 1)
+	        : Math.sqrt(2*Math.PI);
 	    }
 
 	    if (n instanceof BigNumber) {
-	      if (!(isPositiveInteger(n)) && n.isFinite()) {
-	        return math.gamma(n.plus(1));
-	      }
-
-	      if (!n.isFinite()) {
-	        return new BigNumber(n);
-	      }
-
-	      n = n.toNumber();
-	      if (n < fac.length) {
-	        return (n < 21)
-	          ? new BigNumber(fac[n])
-	          : fac[n];
-	      }
-
-	      var one = new BigNumber(1);
-	      value = new BigNumber(fac.length);
-	      res = fac[fac.length - 1];
-	      for (var i = fac.length; i < n; ++i) {
-	        res = res.times(value);
+	      if (!(isNonNegativeInteger(n))) {
+	        return n.isNegative() || n.isFinite()
+	          ? math.gamma(n.plus(1))
+	          : util.bignumber.tau(config.precision).sqrt();
+	      }
+
+	      n = n.toNumber();   // should definitely be below Number.MAX_VALUE
+	      if (n < smallBigFacs.length) {
+	        return BigNumber.convert(smallBigFacs[n]).toSD(config.precision);
+	      }
+
+	      // be wary of round-off errors
+	      var precision = config.precision + (Math.log(n) | 0);
+	      var Big = BigNumber.constructor({precision: precision});
+
+	      // adjust n do align with the precision specific tables
+	      n -= smallBigFacs.length;
+	      if (preciseFacs = bigBigFacs[precision]) {
+	        if (preciseFacs[n]) {
+	          return new BigNumber(preciseFacs[n].toPrecision(config.precision));
+	        }
+	        res = preciseFacs[preciseFacs.length-1];
+	      } else {
+	        preciseFacs = bigBigFacs[precision] = [];
+	        res = new Big(smallBigFacs[smallBigFacs.length-1])
+	          .toSD(precision);
+	      }
+
+	      var one = new Big(1);
+	      value = new Big(preciseFacs.length + smallBigFacs.length);
+	      for (var i = preciseFacs.length; i < n; ++i) {
+	        preciseFacs[i] = res = res.times(value);
 	        value = value.plus(one);
-	        fac[i] = res;
 	      }
 
-	      return fac[n] = res.times(value);
+	      preciseFacs[n] = res.times(value);
+	      return new BigNumber(preciseFacs[n].toPrecision(config.precision));
 	    }
 
 	    if (isBoolean(n) || n === null) {
@@ -14072,16 +14599,19 @@
 	  };
 
 	  /**
-	   * Test whether BigNumber n is a positive integer
+	   * Test whether BigNumber n is a non-negative integer
 	   * @param {BigNumber} n
-	   * @returns {boolean} isPositiveInteger
+	   * @returns {boolean} isNonNegativeInteger
 	   */
-	  var isPositiveInteger = function(n) {
+	  var isNonNegativeInteger = function(n) {
 	    return n.isInteger() && (!n.isNegative() || n.isZero());
 	  };
 
-	  // 0-21! values
-	  var fac = [
+	  // 21! >= values for each precision
+	  var bigBigFacs = [];
+
+	  // 0-20! values
+	  var smallBigFacs = [
 	    1,
 	    1,
 	    2,
@@ -14102,24 +14632,23 @@
 	    355687428096000,
 	    6402373705728000,
 	    121645100408832000,
-	    2432902008176640000,
-	    new BigNumber('51090942171709440000')
+	    2432902008176640000
 	  ]
 	};
 
 
 /***/ },
-/* 104 */
+/* 107 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isBoolean = util['boolean'].isBoolean,
 	      isComplex = Complex.isComplex,
@@ -14303,13 +14832,13 @@
 
 
 /***/ },
-/* 105 */
+/* 108 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var distribution = __webpack_require__(194)(math);
+	  var distribution = __webpack_require__(333)(math);
 
 	  /**
 	   * Return a random number larger or equal to `min` and smaller than `max`
@@ -14346,13 +14875,13 @@
 
 
 /***/ },
-/* 106 */
+/* 109 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var distribution = __webpack_require__(194)(math);
+	  var distribution = __webpack_require__(333)(math);
 
 	  /**
 	   * Return a random integer number larger or equal to `min` and smaller than `max`
@@ -14389,13 +14918,13 @@
 
 
 /***/ },
-/* 107 */
+/* 110 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var distribution = __webpack_require__(194)(math);
+	  var distribution = __webpack_require__(333)(math);
 
 	  /**
 	   * Random pick a value from a one dimensional array.
@@ -14421,13 +14950,13 @@
 
 
 /***/ },
-/* 108 */
+/* 111 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
 
@@ -14534,16 +15063,16 @@
 
 
 /***/ },
-/* 109 */
+/* 112 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isInteger = util.number.isInteger;
@@ -14631,18 +15160,18 @@
 
 
 /***/ },
-/* 110 */
+/* 113 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -14761,13 +15290,13 @@
 
 
 /***/ },
-/* 111 */
+/* 114 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var collection = __webpack_require__(13),
+	  var collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
 	      isArray = Array.isArray;
@@ -14846,18 +15375,18 @@
 
 
 /***/ },
-/* 112 */
+/* 115 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -15010,18 +15539,18 @@
 
 
 /***/ },
-/* 113 */
+/* 116 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -15137,18 +15666,18 @@
 
 
 /***/ },
-/* 114 */
+/* 117 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -15265,18 +15794,18 @@
 
 
 /***/ },
-/* 115 */
+/* 118 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -15392,18 +15921,18 @@
 
 
 /***/ },
-/* 116 */
+/* 119 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -15519,18 +16048,18 @@
 
 
 /***/ },
-/* 117 */
+/* 120 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math, config) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      Unit = __webpack_require__(10),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      nearlyEqual = util.number.nearlyEqual,
@@ -15682,14 +16211,14 @@
 
 
 /***/ },
-/* 118 */
+/* 121 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	  var Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection;
 
@@ -15777,14 +16306,14 @@
 
 
 /***/ },
-/* 119 */
+/* 122 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	  var Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection;
 
@@ -15872,18 +16401,18 @@
 
 
 /***/ },
-/* 120 */
+/* 123 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	  var Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
 
-	      size = __webpack_require__(153).size,
+	      size = __webpack_require__(165).size,
 	      isArray = Array.isArray;
 
 	  /**
@@ -15976,21 +16505,21 @@
 
 
 /***/ },
-/* 121 */
+/* 124 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
-	      Unit = __webpack_require__(10),
+	  var Matrix = __webpack_require__(10),
+	      Unit = __webpack_require__(11),
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
-	      isNumber = __webpack_require__(4).isNumber,
+	      isNumber = __webpack_require__(3).isNumber,
 	      isCollection = collection.isCollection,
 
-	      flatten = __webpack_require__(153).flatten;
+	      flatten = __webpack_require__(165).flatten;
 
 	  /**
 	   * Compute the median of a matrix or a list with values. The values are
@@ -16090,14 +16619,14 @@
 
 
 /***/ },
-/* 122 */
+/* 125 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	  var Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection;
 
@@ -16175,7 +16704,7 @@
 
 
 /***/ },
-/* 123 */
+/* 126 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -16235,14 +16764,14 @@
 
 
 /***/ },
-/* 124 */
+/* 127 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
-	      collection = __webpack_require__(13),
+	  var Matrix = __webpack_require__(10),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection;
 
@@ -16318,18 +16847,18 @@
 
 
 /***/ },
-/* 125 */
+/* 128 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var Matrix = __webpack_require__(9),
+	  var Matrix = __webpack_require__(10),
 	      BigNumber = math.type.BigNumber,
-	      collection = __webpack_require__(13),
+	      collection = __webpack_require__(14),
 
 	      isCollection = collection.isCollection,
-	      isString = __webpack_require__(176).isString,
+	      isString = __webpack_require__(205).isString,
 
 	      DEFAULT_NORMALIZATION = 'unbiased';
 
@@ -16462,22 +16991,24 @@
 
 
 /***/ },
-/* 126 */
+/* 129 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	module.exports = function (math) {
-	  var util = __webpack_require__(160),
+	  var util = __webpack_require__(171),
 
 	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
 
 	      isNumber = util.number.isNumber,
 	      isBoolean = util['boolean'].isBoolean,
 	      isComplex = Complex.isComplex,
-	      isCollection = collection.isCollection;
+	      isCollection = collection.isCollection,
+
+	      bigArcCos = util.bignumber.arccos_arcsec;
 
 	  /**
 	   * Calculate the inverse cosine of a value.
@@ -16499,8 +17030,8 @@
 	   *
 	   *    cos, atan, asin
 	   *
-	   * @param {Number | Boolean | Complex | Array | Matrix | null} x  Function input
-	   * @return {Number | Complex | Array | Matrix} The arc cosine of x
+	   * @param {Number | BigNumber Boolean | Complex | Array | Matrix | null} x  Function input
+	   * @return {Number | BigNumber | Complex | Array | Matrix} The arc cosine of x
 	   */
 	  math.acos = function acos(x) {
 	    if (arguments.length != 1) {
@@ -16545,9 +17076,7 @@
 	    }
 
 	    if (x instanceof BigNumber) {
-	      // TODO: implement BigNumber support
-	      // downgrade to Number
-	      return acos(x.toNumber());
+	      return bigArcCos(x, BigNumber, false);
 	    }
 
 	    throw new math.error.UnsupportedTypeError('acos', math['typeof'](x));
@@ -16556,22 +17085,672 @@
 
 
 /***/ },
-/* 127 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	module.exports = function (math) {
-	  var util = __webpack_require__(160),
-
-	      BigNumber = math.type.BigNumber,
-	      Complex = __webpack_require__(6),
-	      collection = __webpack_require__(13),
-
-	      isNumber = util.number.isNumber,
-	      isBoolean = util['boolean'].isBoolean,
-	      isComplex = Complex.isComplex,
-	      isCollection = collection.isCollection;
+/* 130 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isUnit = Unit.isUnit,
+	      isCollection = collection.isCollection,
+
+	      bigAcosh = util.bignumber.acosh_asinh_asech_acsch;
+
+	  /**
+	   * Calculate the hyperbolic arccos of a value,
+	   * defined as `acosh(x) = ln(sqrt(x^2 - 1) + x)`.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.acosh(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.acosh(1.5);       // returns 0.9624236501192069
+	   *
+	   * See also:
+	   *
+	   *    cosh, asinh, atanh
+	   *
+	   * @param {Number | Boolean | Complex | Unit | Array | Matrix | null} x  Function input
+	   * @return {Number | Complex | Array | Matrix} Hyperbolic arccosine of x
+	   */
+	  math.acosh = function acosh(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('acosh', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      if (x >= 1) {
+	        return Math.log(Math.sqrt(x*x - 1) + x);
+	      }
+	      if (x <= -1) {
+	        return new Complex(Math.log(Math.sqrt(x*x - 1) - x), Math.PI);
+	      }
+	      return acosh(new Complex(x, 0));
+	    }
+
+	    if (isComplex(x)) {
+	      // acosh(z) = (-acos(z).im,  acos(z).re)   for acos(z).im <= 0
+	      //            ( acos(z).im, -acos(z).re)   otherwise
+	      var temp;
+	      var acos = math.acos(x);
+	      if (acos.im <= 0) {
+	        temp = acos.re;
+	        acos.re = -acos.im;
+	        acos.im = temp;
+	      } else {
+	        temp = acos.im;
+	        acos.im = -acos.re;
+	        acos.re = temp;
+	      }
+
+	      return acos;
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, acosh);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? 0 : new Complex(0, 1.5707963267948966);
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigAcosh(x, BigNumber, false, false);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('acosh', math['typeof'](x));
+	  };
+	};
+
+
+/***/ },
+/* 131 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isCollection = collection.isCollection,
+
+	      bigArcCot = util.bignumber.arctan_arccot;
+
+	  /**
+	   * Calculate the inverse cotangent of a value.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.acot(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.acot(0.5);           // returns Number 0.4636476090008061
+	   *    math.acot(math.cot(1.5)); // returns Number 1.5
+	   *
+	   *    math.acot(2);             // returns Complex 1.5707963267948966 -1.3169578969248166 i
+	   *
+	   * See also:
+	   *
+	   *    cot, atan
+	   *
+	   * @param {Number | Boolean | Complex | Array | Matrix | null} x   Function input
+	   * @return {Number | Complex | Array | Matrix} The arc cotangent of x
+	   */
+	  math.acot = function acot(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('acot', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      return (x) ? Math.atan(1 / x) : halfPi;
+	    }
+
+	    if (isComplex(x)) {
+	      if (x.im == 0) {
+	        return new Complex(x.re ? Math.atan(1 / x.re) : halfPi, 0);
+	      }
+
+	      var den = x.re*x.re + x.im*x.im;
+	      x = (den != 0)
+	        ? new Complex(
+	            x.re =  x.re / den,
+	            x.im = -x.im / den)
+	        : new Complex(
+	            (x.re != 0) ?  (x.re / 0) : 0,
+	            (x.im != 0) ? -(x.im / 0) : 0);
+
+	      return math.atan(x);
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, acot);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? 0.7853981633974483 : halfPi;
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigArcCot(x, BigNumber, true);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('acot', math['typeof'](x));
+	  };
+
+	  var halfPi = 1.5707963267948966;
+	};
+
+
+/***/ },
+/* 132 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isUnit = Unit.isUnit,
+	      isCollection = collection.isCollection,
+
+	      bigAcoth = util.bignumber.atanh_acoth;
+
+	  /**
+	   * Calculate the hyperbolic arccotangent of a value,
+	   * defined as `acoth(x) = (ln((x+1)/x) + ln(x/(x-1))) / 2`.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.acoth(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.acoth(0.5);       // returns 0.8047189562170503
+	   *
+	   * See also:
+	   *
+	   *    acsch, asech
+	   *
+	   * @param {Number | Boolean | Complex | Unit | Array | Matrix | null} x  Function input
+	   * @return {Number | Complex | Array | Matrix} Hyperbolic arccotangent of x
+	   */
+	  math.acoth = function acoth(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('acoth', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      if (x >= 1 || x <= -1) {
+	        return isFinite(x) ? (Math.log((x+1)/x) + Math.log(x/(x-1))) / 2 : 0;
+	      }
+	      return (x) ? acoth(new Complex(x, 0)) : new Complex(0, halfPi);
+	    }
+
+	    if (isComplex(x)) {
+	      if (x.re == 0 && x.im == 0) {
+	        return new Complex(0, halfPi);
+	      }
+
+	      // acoth(z) = -i*atanh(1/z)
+	      var den = x.re*x.re + x.im*x.im;
+	      x = (den != 0)
+	        ? new Complex(
+	            x.re / den,
+	           -x.im / den
+	          )
+	        : new Complex(
+	            (x.re != 0) ?  (x.re / 0) : 0,
+	            (x.im != 0) ? -(x.im / 0) : 0
+	          );
+
+	      return math.atanh(x);
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, acoth);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? Infinity : new Complex(0, halfPi);
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigAcoth(x, BigNumber, true);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('acoth', math['typeof'](x));
+	  };
+
+	  var halfPi = 1.5707963267948966;
+	};
+
+
+/***/ },
+/* 133 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isCollection = collection.isCollection,
+
+	      bigArcCsc = util.bignumber.arcsin_arccsc;
+
+	  /**
+	   * Calculate the inverse cosecant of a value.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.acsc(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.acsc(0.5);           // returns Number 0.5235987755982989
+	   *    math.acsc(math.csc(1.5)); // returns Number ~1.5
+	   *
+	   *    math.acsc(2);             // returns Complex 1.5707963267948966 -1.3169578969248166 i
+	   *
+	   * See also:
+	   *
+	   *    csc, asin, asec
+	   *
+	   * @param {Number | Boolean | Complex | Array | Matrix | null} x   Function input
+	   * @return {Number | Complex | Array | Matrix} The arc cosecant of x
+	   */
+	  math.acsc = function acsc(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('acsc', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      if (x <= -1 || x >= 1) {
+	        return Math.asin(1 / x);
+	      }
+	      return acsc(new Complex(x, 0));
+	    }
+
+	    if (isComplex(x)) {
+	      if (x.re == 0 && x.im == 0) {
+	        return new Complex(halfPi, Infinity);
+	      }
+
+	      var den = x.re*x.re + x.im*x.im;
+	      x = (den != 0)
+	        ? new Complex(
+	            x.re =  x.re / den,
+	            x.im = -x.im / den)
+	        : new Complex(
+	            (x.re != 0) ?  (x.re / 0) : 0,
+	            (x.im != 0) ? -(x.im / 0) : 0);
+
+	      return math.asin(x);
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, acsc);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? halfPi : new Complex(halfPi, Infinity);
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigArcCsc(x, BigNumber, true);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('acsc', math['typeof'](x));
+	  };
+
+	  var halfPi = 1.5707963267948966;
+	};
+
+
+/***/ },
+/* 134 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isUnit = Unit.isUnit,
+	      isCollection = collection.isCollection,
+
+	      bigAcsch = util.bignumber.acosh_asinh_asech_acsch;
+
+	  /**
+	   * Calculate the hyperbolic arccosecant of a value,
+	   * defined as `acsch(x) = ln(1/x + sqrt(1/x^2 + 1))`.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.acsch(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.acsch(0.5);       // returns 1.4436354751788103
+	   *
+	   * See also:
+	   *
+	   *    asech, acoth
+	   *
+	   * @param {Number | Boolean | Complex | Unit | Array | Matrix | null} x  Function input
+	   * @return {Number | Complex | Array | Matrix} Hyperbolic arccosecant of x
+	   */
+	  math.acsch = function acsch(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('acsch', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      x = 1 / x;
+	      return Math.log(x + Math.sqrt(x*x + 1));
+	    }
+
+	    if (isComplex(x)) {
+	      if (x.im == 0) {
+	        x = (x.re != 0)
+	          ? Math.log(x.re + Math.sqrt(x.re*x.re + 1))
+	          : Infinity;
+	        return new Complex(x, 0);
+	      }
+
+	      // acsch(z) = -i*asinh(1/z)
+	      var den = x.re*x.re + x.im*x.im;
+	      x = (den != 0)
+	        ? new Complex(
+	            x.re / den,
+	           -x.im / den
+	          )
+	        : new Complex(
+	            (x.re != 0) ?  (x.re / 0) : 0,
+	            (x.im != 0) ? -(x.im / 0) : 0
+	          );
+
+	      return math.asinh(x);
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, acsch);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? 0.881373587019543 : Infinity;
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigAcsch(x, BigNumber, true, true);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('acsch', math['typeof'](x));
+	  };
+	};
+
+
+/***/ },
+/* 135 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isCollection = collection.isCollection,
+
+	      bigArcSec = util.bignumber.arccos_arcsec;
+
+	  /**
+	   * Calculate the inverse secant of a value.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.asec(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.asec(0.5);           // returns 1.0471975511965979
+	   *    math.asec(math.sec(1.5)); // returns 1.5
+	   *
+	   *    math.asec(2);             // returns 0 + 1.3169578969248166 i
+	   *
+	   * See also:
+	   *
+	   *    acos, acot, acsc
+	   *
+	   * @param {Number | Boolean | Complex | Array | Matrix | null} x  Function input
+	   * @return {Number | Complex | Array | Matrix} The arc secant of x
+	   */
+	  math.asec = function asec(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('asec', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      if (x <= -1 || x >= 1) {
+	        return Math.acos(1 / x);
+	      }
+	      return asec(new Complex(x, 0));
+	    }
+
+	    if (isComplex(x)) {
+	      if (x.re == 0 && x.im == 0) {
+	        return new Complex(0, Infinity);
+	      }
+
+	      var den = x.re*x.re + x.im*x.im;
+	      x = (den != 0)
+	        ? new Complex(
+	            x.re =  x.re / den,
+	            x.im = -x.im / den)
+	        : new Complex(
+	            (x.re != 0) ?  (x.re / 0) : 0,
+	            (x.im != 0) ? -(x.im / 0) : 0);
+
+	      return math.acos(x);
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, asec);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? 0 : new Complex(0, Infinity);
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigArcSec(x, BigNumber, true);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('asec', math['typeof'](x));
+	  };
+	};
+
+
+/***/ },
+/* 136 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {
+	  var util = __webpack_require__(171),
+
+	      BigNumber = math.type.BigNumber,
+	      Complex = __webpack_require__(7),
+	      Unit = __webpack_require__(11),
+	      collection = __webpack_require__(14),
+
+	      isNumber = util.number.isNumber,
+	      isBoolean = util['boolean'].isBoolean,
+	      isComplex = Complex.isComplex,
+	      isUnit = Unit.isUnit,
+	      isCollection = collection.isCollection,
+
+	      bigAsech = util.bignumber.acosh_asinh_asech_acsch;
+
+	  /**
+	   * Calculate the hyperbolic arccos of a value,
+	   * defined as `asech(x) = ln(sqrt(1/x^2 - 1) + 1/x)`.
+	   *
+	   * For matrices, the function is evaluated element wise.
+	   *
+	   * Syntax:
+	   *
+	   *    math.asech(x)
+	   *
+	   * Examples:
+	   *
+	   *    math.asech(0.5);       // returns 1.3169578969248166
+	   *
+	   * See also:
+	   *
+	   *    acsch, acoth
+	   *
+	   * @param {Number | Boolean | Complex | Unit | Array | Matrix | null} x  Function input
+	   * @return {Number | Complex | Array | Matrix} Hyperbolic arcsecant of x
+	   */
+	  math.asech = function asech(x) {
+	    if (arguments.length != 1) {
+	      throw new math.error.ArgumentsError('asech', arguments.length, 1);
+	    }
+
+	    if (isNumber(x)) {
+	      if (x <= 1 && x >= -1) {
+	        x = 1 / x;
+
+	        var ret = Math.sqrt(x*x - 1);
+	        if (x > 0) {
+	          return Math.log(ret + x);
+	        }
+
+	        return new Complex(Math.log(ret - x), Math.PI);
+	      }
+
+	      return asech(new Complex(x, 0));
+	    }
+
+	    if (isComplex(x)) {
+	      if (x.re == 0 && x.im == 0) {
+	        return new Complex(Infinity, 0);
+	      }
+
+	      // acsch(z) = -i*asinh(1/z)
+	      var den = x.re*x.re + x.im*x.im;
+	      x = (den != 0)
+	        ? new Complex(
+	            x.re / den,
+	           -x.im / den
+	          )
+	        : new Complex(
+	            (x.re != 0) ?  (x.re / 0) : 0,
+	            (x.im != 0) ? -(x.im / 0) : 0
+	          );
+
+	      return math.acosh(x);
+	    }
+
+	    if (isCollection(x)) {
+	      return collection.deepMap(x, asech);
+	    }
+
+	    if (isBoolean(x) || x === null) {
+	      return (x) ? 0 : Infinity;
+	    }
+
+	    if (x instanceof BigNumber) {
+	      return bigAsech(x, BigNumber, false, true);
+	    }
+
+	    throw new math.error.UnsupportedTypeError('asech', math['typeof'](x));
+	  };
+	};
+
+
+/***/ },
+/* 137 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = function (math) {