diff --git a/dist/vis.js b/dist/vis.js
index 41587016..d5aeed03 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -81,65 +81,65 @@ return /******/ (function(modules) { // webpackBootstrap
 
   // utils
   exports.util = __webpack_require__(1);
-  exports.DOMutil = __webpack_require__(2);
+  exports.DOMutil = __webpack_require__(6);
 
   // data
-  exports.DataSet = __webpack_require__(3);
-  exports.DataView = __webpack_require__(4);
+  exports.DataSet = __webpack_require__(7);
+  exports.DataView = __webpack_require__(8);
 
   // Graph3d
-  exports.Graph3d = __webpack_require__(5);
+  exports.Graph3d = __webpack_require__(9);
   exports.graph3d = {
-    Camera: __webpack_require__(6),
-    Filter: __webpack_require__(7),
-    Point2d: __webpack_require__(8),
-    Point3d: __webpack_require__(9),
-    Slider: __webpack_require__(10),
-    StepNumber: __webpack_require__(11)
+    Camera: __webpack_require__(13),
+    Filter: __webpack_require__(14),
+    Point2d: __webpack_require__(12),
+    Point3d: __webpack_require__(11),
+    Slider: __webpack_require__(15),
+    StepNumber: __webpack_require__(16)
   };
 
   // Timeline
-  exports.Timeline = __webpack_require__(12);
-  exports.Graph2d = __webpack_require__(13);
+  exports.Timeline = __webpack_require__(17);
+  exports.Graph2d = __webpack_require__(33);
   exports.timeline = {
-    DateUtil: __webpack_require__(14),
-    DataStep: __webpack_require__(15),
-    Range: __webpack_require__(16),
-    stack: __webpack_require__(17),
-    TimeStep: __webpack_require__(18),
+    DateUtil: __webpack_require__(23),
+    DataStep: __webpack_require__(36),
+    Range: __webpack_require__(20),
+    stack: __webpack_require__(39),
+    TimeStep: __webpack_require__(26),
 
     components: {
       items: {
-        Item: __webpack_require__(29),
-        BackgroundItem: __webpack_require__(30),
-        BoxItem: __webpack_require__(31),
-        PointItem: __webpack_require__(32),
-        RangeItem: __webpack_require__(33)
+        Item: __webpack_require__(40),
+        BackgroundItem: __webpack_require__(41),
+        BoxItem: __webpack_require__(43),
+        PointItem: __webpack_require__(44),
+        RangeItem: __webpack_require__(42)
       },
 
-      Component: __webpack_require__(19),
-      CurrentTime: __webpack_require__(20),
-      CustomTime: __webpack_require__(21),
-      DataAxis: __webpack_require__(22),
-      GraphGroup: __webpack_require__(23),
-      Group: __webpack_require__(24),
-      ItemSet: __webpack_require__(25),
-      Legend: __webpack_require__(26),
-      LineGraph: __webpack_require__(27),
-      TimeAxis: __webpack_require__(28)
+      Component: __webpack_require__(22),
+      CurrentTime: __webpack_require__(27),
+      CustomTime: __webpack_require__(29),
+      DataAxis: __webpack_require__(35),
+      GraphGroup: __webpack_require__(37),
+      Group: __webpack_require__(45),
+      ItemSet: __webpack_require__(30),
+      Legend: __webpack_require__(38),
+      LineGraph: __webpack_require__(34),
+      TimeAxis: __webpack_require__(25)
     }
   };
 
   // Network
-  exports.Network = __webpack_require__(34);
+  exports.Network = __webpack_require__(46);
   exports.network = {
-    Edge: __webpack_require__(35),
-    Groups: __webpack_require__(36),
-    Images: __webpack_require__(37),
-    Node: __webpack_require__(38),
-    Popup: __webpack_require__(39),
-    dotparser: __webpack_require__(40),
-    gephiParser: __webpack_require__(41)
+    Edge: __webpack_require__(52),
+    Groups: __webpack_require__(49),
+    Images: __webpack_require__(50),
+    Node: __webpack_require__(51),
+    Popup: __webpack_require__(53),
+    dotparser: __webpack_require__(47),
+    gephiParser: __webpack_require__(48)
   };
 
   // Deprecated since v3.0.0
@@ -148,8 +148,8 @@ return /******/ (function(modules) { // webpackBootstrap
   };
 
   // bundled external libraries
-  exports.moment = __webpack_require__(42);
-  exports.hammer = __webpack_require__(43);
+  exports.moment = __webpack_require__(2);
+  exports.hammer = __webpack_require__(18);
 
 
 /***/ },
@@ -160,7 +160,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
   // first check if moment.js is already loaded in the browser window, if so,
   // use this instance. Else, load via commonjs.
-  var moment = __webpack_require__(42);
+  var moment = __webpack_require__(2);
 
   /**
    * Test whether given object is a number
@@ -1543,27553 +1543,26924 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 2 */
 /***/ function(module, exports, __webpack_require__) {
 
-  // DOM utility methods
-
-  /**
-   * this prepares the JSON container for allocating SVG elements
-   * @param JSONcontainer
-   * @private
-   */
-  exports.prepareElements = function(JSONcontainer) {
-    // cleanup the redundant svgElements;
-    for (var elementType in JSONcontainer) {
-      if (JSONcontainer.hasOwnProperty(elementType)) {
-        JSONcontainer[elementType].redundant = JSONcontainer[elementType].used;
-        JSONcontainer[elementType].used = [];
-      }
-    }
-  };
-
-  /**
-   * this cleans up all the unused SVG elements. By asking for the parentNode, we only need to supply the JSON container from
-   * which to remove the redundant elements.
-   *
-   * @param JSONcontainer
-   * @private
-   */
-  exports.cleanupElements = function(JSONcontainer) {
-    // cleanup the redundant svgElements;
-    for (var elementType in JSONcontainer) {
-      if (JSONcontainer.hasOwnProperty(elementType)) {
-        if (JSONcontainer[elementType].redundant) {
-          for (var i = 0; i < JSONcontainer[elementType].redundant.length; i++) {
-            JSONcontainer[elementType].redundant[i].parentNode.removeChild(JSONcontainer[elementType].redundant[i]);
-          }
-          JSONcontainer[elementType].redundant = [];
-        }
-      }
-    }
-  };
-
-  /**
-   * Allocate or generate an SVG element if needed. Store a reference to it in the JSON container and draw it in the svgContainer
-   * the JSON container and the SVG container have to be supplied so other svg containers (like the legend) can use this.
-   *
-   * @param elementType
-   * @param JSONcontainer
-   * @param svgContainer
-   * @returns {*}
-   * @private
-   */
-  exports.getSVGElement = function (elementType, JSONcontainer, svgContainer) {
-    var element;
-    // allocate SVG element, if it doesnt yet exist, create one.
-    if (JSONcontainer.hasOwnProperty(elementType)) { // this element has been created before
-      // check if there is an redundant element
-      if (JSONcontainer[elementType].redundant.length > 0) {
-        element = JSONcontainer[elementType].redundant[0];
-        JSONcontainer[elementType].redundant.shift();
-      }
-      else {
-        // create a new element and add it to the SVG
-        element = document.createElementNS('http://www.w3.org/2000/svg', elementType);
-        svgContainer.appendChild(element);
-      }
-    }
-    else {
-      // create a new element and add it to the SVG, also create a new object in the svgElements to keep track of it.
-      element = document.createElementNS('http://www.w3.org/2000/svg', elementType);
-      JSONcontainer[elementType] = {used: [], redundant: []};
-      svgContainer.appendChild(element);
-    }
-    JSONcontainer[elementType].used.push(element);
-    return element;
-  };
-
-
-  /**
-   * Allocate or generate an SVG element if needed. Store a reference to it in the JSON container and draw it in the svgContainer
-   * the JSON container and the SVG container have to be supplied so other svg containers (like the legend) can use this.
-   *
-   * @param elementType
-   * @param JSONcontainer
-   * @param DOMContainer
-   * @returns {*}
-   * @private
-   */
-  exports.getDOMElement = function (elementType, JSONcontainer, DOMContainer, insertBefore) {
-    var element;
-    // allocate DOM element, if it doesnt yet exist, create one.
-    if (JSONcontainer.hasOwnProperty(elementType)) { // this element has been created before
-      // check if there is an redundant element
-      if (JSONcontainer[elementType].redundant.length > 0) {
-        element = JSONcontainer[elementType].redundant[0];
-        JSONcontainer[elementType].redundant.shift();
-      }
-      else {
-        // create a new element and add it to the SVG
-        element = document.createElement(elementType);
-        if (insertBefore !== undefined) {
-          DOMContainer.insertBefore(element, insertBefore);
-        }
-        else {
-          DOMContainer.appendChild(element);
-        }
-      }
-    }
-    else {
-      // create a new element and add it to the SVG, also create a new object in the svgElements to keep track of it.
-      element = document.createElement(elementType);
-      JSONcontainer[elementType] = {used: [], redundant: []};
-      if (insertBefore !== undefined) {
-        DOMContainer.insertBefore(element, insertBefore);
-      }
-      else {
-        DOMContainer.appendChild(element);
-      }
-    }
-    JSONcontainer[elementType].used.push(element);
-    return element;
-  };
-
-
-
-
-  /**
-   * draw a point object. this is a seperate function because it can also be called by the legend.
-   * The reason the JSONcontainer and the target SVG svgContainer have to be supplied is so the legend can use these functions
-   * as well.
-   *
-   * @param x
-   * @param y
-   * @param group
-   * @param JSONcontainer
-   * @param svgContainer
-   * @returns {*}
-   */
-  exports.drawPoint = function(x, y, group, JSONcontainer, svgContainer) {
-    var point;
-    if (group.options.drawPoints.style == 'circle') {
-      point = exports.getSVGElement('circle',JSONcontainer,svgContainer);
-      point.setAttributeNS(null, "cx", x);
-      point.setAttributeNS(null, "cy", y);
-      point.setAttributeNS(null, "r", 0.5 * group.options.drawPoints.size);
-      point.setAttributeNS(null, "class", group.className + " point");
-    }
-    else {
-      point = exports.getSVGElement('rect',JSONcontainer,svgContainer);
-      point.setAttributeNS(null, "x", x - 0.5*group.options.drawPoints.size);
-      point.setAttributeNS(null, "y", y - 0.5*group.options.drawPoints.size);
-      point.setAttributeNS(null, "width", group.options.drawPoints.size);
-      point.setAttributeNS(null, "height", group.options.drawPoints.size);
-      point.setAttributeNS(null, "class", group.className + " point");
-    }
-    return point;
-  };
+  // first check if moment.js is already loaded in the browser window, if so,
+  // use this instance. Else, load via commonjs.
+  module.exports = (typeof window !== 'undefined') && window['moment'] || __webpack_require__(3);
 
-  /**
-   * draw a bar SVG element centered on the X coordinate
-   *
-   * @param x
-   * @param y
-   * @param className
-   */
-  exports.drawBar = function (x, y, width, height, className, JSONcontainer, svgContainer) {
-    if (height != 0) {
-      if (height < 0) {
-        height *= -1;
-        y -= height;
-      }
-      var rect = exports.getSVGElement('rect',JSONcontainer, svgContainer);
-      rect.setAttributeNS(null, "x", x - 0.5 * width);
-      rect.setAttributeNS(null, "y", y);
-      rect.setAttributeNS(null, "width", width);
-      rect.setAttributeNS(null, "height", height);
-      rect.setAttributeNS(null, "class", className);
-    }
-  };
 
 /***/ },
 /* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
-  var util = __webpack_require__(1);
+  var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(global, module) {//! moment.js
+  //! version : 2.8.3
+  //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+  //! license : MIT
+  //! momentjs.com
 
-  /**
-   * DataSet
-   *
-   * Usage:
-   *     var dataSet = new DataSet({
-   *         fieldId: '_id',
-   *         type: {
-   *             // ...
-   *         }
-   *     });
-   *
-   *     dataSet.add(item);
-   *     dataSet.add(data);
-   *     dataSet.update(item);
-   *     dataSet.update(data);
-   *     dataSet.remove(id);
-   *     dataSet.remove(ids);
-   *     var data = dataSet.get();
-   *     var data = dataSet.get(id);
-   *     var data = dataSet.get(ids);
-   *     var data = dataSet.get(ids, options, data);
-   *     dataSet.clear();
-   *
-   * A data set can:
-   * - add/remove/update data
-   * - gives triggers upon changes in the data
-   * - can  import/export data in various data formats
-   *
-   * @param {Array | DataTable} [data]    Optional array with initial data
-   * @param {Object} [options]   Available options:
-   *                             {String} fieldId Field name of the id in the
-   *                                              items, 'id' by default.
-   *                             {Object.<String, String} type
-   *                                              A map with field names as key,
-   *                                              and the field type as value.
-   * @constructor DataSet
-   */
-  // TODO: add a DataSet constructor DataSet(data, options)
-  function DataSet (data, options) {
-    // correctly read optional arguments
-    if (data && !Array.isArray(data) && !util.isDataTable(data)) {
-      options = data;
-      data = null;
-    }
+  (function (undefined) {
+      /************************************
+          Constants
+      ************************************/
 
-    this._options = options || {};
-    this._data = {};                                 // map with data indexed by id
-    this._fieldId = this._options.fieldId || 'id';   // name of the field containing id
-    this._type = {};                                 // internal field types (NOTE: this can differ from this._options.type)
+      var moment,
+          VERSION = '2.8.3',
+          // the global-scope this is NOT the global object in Node.js
+          globalScope = typeof global !== 'undefined' ? global : this,
+          oldGlobalMoment,
+          round = Math.round,
+          hasOwnProperty = Object.prototype.hasOwnProperty,
+          i,
 
-    // all variants of a Date are internally stored as Date, so we can convert
-    // from everything to everything (also from ISODate to Number for example)
-    if (this._options.type) {
-      for (var field in this._options.type) {
-        if (this._options.type.hasOwnProperty(field)) {
-          var value = this._options.type[field];
-          if (value == 'Date' || value == 'ISODate' || value == 'ASPDate') {
-            this._type[field] = 'Date';
-          }
-          else {
-            this._type[field] = value;
-          }
-        }
-      }
-    }
+          YEAR = 0,
+          MONTH = 1,
+          DATE = 2,
+          HOUR = 3,
+          MINUTE = 4,
+          SECOND = 5,
+          MILLISECOND = 6,
 
-    // TODO: deprecated since version 1.1.1 (or 2.0.0?)
-    if (this._options.convert) {
-      throw new Error('Option "convert" is deprecated. Use "type" instead.');
-    }
+          // internal storage for locale config files
+          locales = {},
 
-    this._subscribers = {};  // event subscribers
+          // extra moment internal properties (plugins register props here)
+          momentProperties = [],
 
-    // add initial data when provided
-    if (data) {
-      this.add(data);
-    }
-  }
+          // check for nodeJS
+          hasModule = (typeof module !== 'undefined' && module.exports),
 
-  /**
-   * Subscribe to an event, add an event listener
-   * @param {String} event        Event name. Available events: 'put', 'update',
-   *                              'remove'
-   * @param {function} callback   Callback method. Called with three parameters:
-   *                                  {String} event
-   *                                  {Object | null} params
-   *                                  {String | Number} senderId
-   */
-  DataSet.prototype.on = function(event, callback) {
-    var subscribers = this._subscribers[event];
-    if (!subscribers) {
-      subscribers = [];
-      this._subscribers[event] = subscribers;
-    }
+          // ASP.NET json date format regex
+          aspNetJsonRegex = /^\/?Date\((\-?\d+)/i,
+          aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,
 
-    subscribers.push({
-      callback: callback
-    });
-  };
+          // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+          // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+          isoDurationRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,
 
-  // TODO: make this function deprecated (replaced with `on` since version 0.5)
-  DataSet.prototype.subscribe = DataSet.prototype.on;
+          // format tokens
+          formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g,
+          localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,
 
-  /**
-   * Unsubscribe from an event, remove an event listener
-   * @param {String} event
-   * @param {function} callback
-   */
-  DataSet.prototype.off = function(event, callback) {
-    var subscribers = this._subscribers[event];
-    if (subscribers) {
-      this._subscribers[event] = subscribers.filter(function (listener) {
-        return (listener.callback != callback);
-      });
-    }
-  };
+          // parsing token regexes
+          parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99
+          parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999
+          parseTokenOneToFourDigits = /\d{1,4}/, // 0 - 9999
+          parseTokenOneToSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999
+          parseTokenDigits = /\d+/, // nonzero number of digits
+          parseTokenWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i, // any word (or two) characters or numbers including two/three word month in arabic.
+          parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/gi, // +00:00 -00:00 +0000 -0000 or Z
+          parseTokenT = /T/i, // T (ISO separator)
+          parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123
+          parseTokenOrdinal = /\d{1,2}/,
 
-  // TODO: make this function deprecated (replaced with `on` since version 0.5)
-  DataSet.prototype.unsubscribe = DataSet.prototype.off;
+          //strict parsing regexes
+          parseTokenOneDigit = /\d/, // 0 - 9
+          parseTokenTwoDigits = /\d\d/, // 00 - 99
+          parseTokenThreeDigits = /\d{3}/, // 000 - 999
+          parseTokenFourDigits = /\d{4}/, // 0000 - 9999
+          parseTokenSixDigits = /[+-]?\d{6}/, // -999,999 - 999,999
+          parseTokenSignedNumber = /[+-]?\d+/, // -inf - inf
 
-  /**
-   * Trigger an event
-   * @param {String} event
-   * @param {Object | null} params
-   * @param {String} [senderId]       Optional id of the sender.
-   * @private
-   */
-  DataSet.prototype._trigger = function (event, params, senderId) {
-    if (event == '*') {
-      throw new Error('Cannot trigger event *');
-    }
+          // iso 8601 regex
+          // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+          isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
 
-    var subscribers = [];
-    if (event in this._subscribers) {
-      subscribers = subscribers.concat(this._subscribers[event]);
-    }
-    if ('*' in this._subscribers) {
-      subscribers = subscribers.concat(this._subscribers['*']);
-    }
+          isoFormat = 'YYYY-MM-DDTHH:mm:ssZ',
 
-    for (var i = 0; i < subscribers.length; i++) {
-      var subscriber = subscribers[i];
-      if (subscriber.callback) {
-        subscriber.callback(event, params, senderId || null);
-      }
-    }
-  };
+          isoDates = [
+              ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/],
+              ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
+              ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
+              ['GGGG-[W]WW', /\d{4}-W\d{2}/],
+              ['YYYY-DDD', /\d{4}-\d{3}/]
+          ],
 
-  /**
-   * Add data.
-   * Adding an item will fail when there already is an item with the same id.
-   * @param {Object | Array | DataTable} data
-   * @param {String} [senderId] Optional sender id
-   * @return {Array} addedIds      Array with the ids of the added items
-   */
-  DataSet.prototype.add = function (data, senderId) {
-    var addedIds = [],
-        id,
-        me = this;
+          // iso time formats and regexes
+          isoTimes = [
+              ['HH:mm:ss.SSSS', /(T| )\d\d:\d\d:\d\d\.\d+/],
+              ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/],
+              ['HH:mm', /(T| )\d\d:\d\d/],
+              ['HH', /(T| )\d\d/]
+          ],
 
-    if (Array.isArray(data)) {
-      // Array
-      for (var i = 0, len = data.length; i < len; i++) {
-        id = me._addItem(data[i]);
-        addedIds.push(id);
-      }
-    }
-    else if (util.isDataTable(data)) {
-      // Google DataTable
-      var columns = this._getColumnNames(data);
-      for (var row = 0, rows = data.getNumberOfRows(); row < rows; row++) {
-        var item = {};
-        for (var col = 0, cols = columns.length; col < cols; col++) {
-          var field = columns[col];
-          item[field] = data.getValue(row, col);
-        }
+          // timezone chunker '+10:00' > ['10', '00'] or '-1530' > ['-15', '30']
+          parseTimezoneChunker = /([\+\-]|\d\d)/gi,
 
-        id = me._addItem(item);
-        addedIds.push(id);
-      }
-    }
-    else if (data instanceof Object) {
-      // Single item
-      id = me._addItem(data);
-      addedIds.push(id);
-    }
-    else {
-      throw new Error('Unknown dataType');
-    }
+          // getter and setter names
+          proxyGettersAndSetters = 'Date|Hours|Minutes|Seconds|Milliseconds'.split('|'),
+          unitMillisecondFactors = {
+              'Milliseconds' : 1,
+              'Seconds' : 1e3,
+              'Minutes' : 6e4,
+              'Hours' : 36e5,
+              'Days' : 864e5,
+              'Months' : 2592e6,
+              'Years' : 31536e6
+          },
 
-    if (addedIds.length) {
-      this._trigger('add', {items: addedIds}, senderId);
-    }
+          unitAliases = {
+              ms : 'millisecond',
+              s : 'second',
+              m : 'minute',
+              h : 'hour',
+              d : 'day',
+              D : 'date',
+              w : 'week',
+              W : 'isoWeek',
+              M : 'month',
+              Q : 'quarter',
+              y : 'year',
+              DDD : 'dayOfYear',
+              e : 'weekday',
+              E : 'isoWeekday',
+              gg: 'weekYear',
+              GG: 'isoWeekYear'
+          },
 
-    return addedIds;
-  };
+          camelFunctions = {
+              dayofyear : 'dayOfYear',
+              isoweekday : 'isoWeekday',
+              isoweek : 'isoWeek',
+              weekyear : 'weekYear',
+              isoweekyear : 'isoWeekYear'
+          },
 
-  /**
-   * Update existing items. When an item does not exist, it will be created
-   * @param {Object | Array | DataTable} data
-   * @param {String} [senderId] Optional sender id
-   * @return {Array} updatedIds     The ids of the added or updated items
-   */
-  DataSet.prototype.update = function (data, senderId) {
-    var addedIds = [];
-    var updatedIds = [];
-    var updatedData = [];
-    var me = this;
-    var fieldId = me._fieldId;
+          // format function strings
+          formatFunctions = {},
 
-    var addOrUpdate = function (item) {
-      var id = item[fieldId];
-      if (me._data[id]) {
-        // update item
-        id = me._updateItem(item);
-        updatedIds.push(id);
-        updatedData.push(item);
-      }
-      else {
-        // add new item
-        id = me._addItem(item);
-        addedIds.push(id);
-      }
-    };
+          // default relative time thresholds
+          relativeTimeThresholds = {
+              s: 45,  // seconds to minute
+              m: 45,  // minutes to hour
+              h: 22,  // hours to day
+              d: 26,  // days to month
+              M: 11   // months to year
+          },
 
-    if (Array.isArray(data)) {
-      // Array
-      for (var i = 0, len = data.length; i < len; i++) {
-        addOrUpdate(data[i]);
-      }
-    }
-    else if (util.isDataTable(data)) {
-      // Google DataTable
-      var columns = this._getColumnNames(data);
-      for (var row = 0, rows = data.getNumberOfRows(); row < rows; row++) {
-        var item = {};
-        for (var col = 0, cols = columns.length; col < cols; col++) {
-          var field = columns[col];
-          item[field] = data.getValue(row, col);
-        }
-
-        addOrUpdate(item);
-      }
-    }
-    else if (data instanceof Object) {
-      // Single item
-      addOrUpdate(data);
-    }
-    else {
-      throw new Error('Unknown dataType');
-    }
-
-    if (addedIds.length) {
-      this._trigger('add', {items: addedIds}, senderId);
-    }
-    if (updatedIds.length) {
-      this._trigger('update', {items: updatedIds, data: updatedData}, senderId);
-    }
-
-    return addedIds.concat(updatedIds);
-  };
+          // tokens to ordinalize and pad
+          ordinalizeTokens = 'DDD w W M D d'.split(' '),
+          paddedTokens = 'M D H h m s w W'.split(' '),
 
-  /**
-   * Get a data item or multiple items.
-   *
-   * Usage:
-   *
-   *     get()
-   *     get(options: Object)
-   *     get(options: Object, data: Array | DataTable)
-   *
-   *     get(id: Number | String)
-   *     get(id: Number | String, options: Object)
-   *     get(id: Number | String, options: Object, data: Array | DataTable)
-   *
-   *     get(ids: Number[] | String[])
-   *     get(ids: Number[] | String[], options: Object)
-   *     get(ids: Number[] | String[], options: Object, data: Array | DataTable)
-   *
-   * Where:
-   *
-   * {Number | String} id         The id of an item
-   * {Number[] | String{}} ids    An array with ids of items
-   * {Object} options             An Object with options. Available options:
-   *                              {String} [returnType] Type of data to be
-   *                                  returned. Can be 'DataTable' or 'Array' (default)
-   *                              {Object.<String, String>} [type]
-   *                              {String[]} [fields] field names to be returned
-   *                              {function} [filter] filter items
-   *                              {String | function} [order] Order the items by
-   *                                  a field name or custom sort function.
-   * {Array | DataTable} [data]   If provided, items will be appended to this
-   *                              array or table. Required in case of Google
-   *                              DataTable.
-   *
-   * @throws Error
-   */
-  DataSet.prototype.get = function (args) {
-    var me = this;
+          formatTokenFunctions = {
+              M    : function () {
+                  return this.month() + 1;
+              },
+              MMM  : function (format) {
+                  return this.localeData().monthsShort(this, format);
+              },
+              MMMM : function (format) {
+                  return this.localeData().months(this, format);
+              },
+              D    : function () {
+                  return this.date();
+              },
+              DDD  : function () {
+                  return this.dayOfYear();
+              },
+              d    : function () {
+                  return this.day();
+              },
+              dd   : function (format) {
+                  return this.localeData().weekdaysMin(this, format);
+              },
+              ddd  : function (format) {
+                  return this.localeData().weekdaysShort(this, format);
+              },
+              dddd : function (format) {
+                  return this.localeData().weekdays(this, format);
+              },
+              w    : function () {
+                  return this.week();
+              },
+              W    : function () {
+                  return this.isoWeek();
+              },
+              YY   : function () {
+                  return leftZeroFill(this.year() % 100, 2);
+              },
+              YYYY : function () {
+                  return leftZeroFill(this.year(), 4);
+              },
+              YYYYY : function () {
+                  return leftZeroFill(this.year(), 5);
+              },
+              YYYYYY : function () {
+                  var y = this.year(), sign = y >= 0 ? '+' : '-';
+                  return sign + leftZeroFill(Math.abs(y), 6);
+              },
+              gg   : function () {
+                  return leftZeroFill(this.weekYear() % 100, 2);
+              },
+              gggg : function () {
+                  return leftZeroFill(this.weekYear(), 4);
+              },
+              ggggg : function () {
+                  return leftZeroFill(this.weekYear(), 5);
+              },
+              GG   : function () {
+                  return leftZeroFill(this.isoWeekYear() % 100, 2);
+              },
+              GGGG : function () {
+                  return leftZeroFill(this.isoWeekYear(), 4);
+              },
+              GGGGG : function () {
+                  return leftZeroFill(this.isoWeekYear(), 5);
+              },
+              e : function () {
+                  return this.weekday();
+              },
+              E : function () {
+                  return this.isoWeekday();
+              },
+              a    : function () {
+                  return this.localeData().meridiem(this.hours(), this.minutes(), true);
+              },
+              A    : function () {
+                  return this.localeData().meridiem(this.hours(), this.minutes(), false);
+              },
+              H    : function () {
+                  return this.hours();
+              },
+              h    : function () {
+                  return this.hours() % 12 || 12;
+              },
+              m    : function () {
+                  return this.minutes();
+              },
+              s    : function () {
+                  return this.seconds();
+              },
+              S    : function () {
+                  return toInt(this.milliseconds() / 100);
+              },
+              SS   : function () {
+                  return leftZeroFill(toInt(this.milliseconds() / 10), 2);
+              },
+              SSS  : function () {
+                  return leftZeroFill(this.milliseconds(), 3);
+              },
+              SSSS : function () {
+                  return leftZeroFill(this.milliseconds(), 3);
+              },
+              Z    : function () {
+                  var a = -this.zone(),
+                      b = '+';
+                  if (a < 0) {
+                      a = -a;
+                      b = '-';
+                  }
+                  return b + leftZeroFill(toInt(a / 60), 2) + ':' + leftZeroFill(toInt(a) % 60, 2);
+              },
+              ZZ   : function () {
+                  var a = -this.zone(),
+                      b = '+';
+                  if (a < 0) {
+                      a = -a;
+                      b = '-';
+                  }
+                  return b + leftZeroFill(toInt(a / 60), 2) + leftZeroFill(toInt(a) % 60, 2);
+              },
+              z : function () {
+                  return this.zoneAbbr();
+              },
+              zz : function () {
+                  return this.zoneName();
+              },
+              X    : function () {
+                  return this.unix();
+              },
+              Q : function () {
+                  return this.quarter();
+              }
+          },
 
-    // parse the arguments
-    var id, i