diff --git a/dist/videojs-abloop.min.js b/dist/videojs-abloop.min.js
index 75beb08..8d80f8f 100644
--- a/dist/videojs-abloop.min.js
+++ b/dist/videojs-abloop.min.js
@@ -1 +1 @@
-!function(e,t){"function"==typeof define&&define.amd?define([],t.bind(this,e,e.videojs)):"undefined"!=typeof module&&module.exports?module.exports=t(e,e.videojs):t(e,e.videojs)}(window,function(e,t){"use strict";var n="1.0.1",o=function(o){o=o||{};var r=this,a=function(e){return!isNaN(parseFloat(e))&&isFinite(e)},i=function(e){return e&&"[object Function]"==={}.toString.call(e)},u=function(e){return!!e},f=function(e,n){return n=n||1,t.formatTime(e)+"."+Math.floor(e%1*Math.pow(10,n))},c=function(e,t){var n=Math.pow(10,t);return Math.floor(e*n)/n},l=function(e){if(void 0!==e){if(a(e))return e;if(/^([+\-])?([\d\.]+)$/i.test(e))return parseFloat(e);var t=/^([+\-])?((([\d]+)(h|:(?=.*:)))?(([\d]+)(m|:|$))?)?(([\d\.]+)s?)?$/i.exec(e);if(!t)return null;var n={match:t[0],sign:t[1],hours:t[4]||0,mins:t[7]||0,secs:t[10]||0},o="-"==n.sign?-1:1,r=60*parseFloat(n.hours)*60+60*parseFloat(n.mins)+parseFloat(n.secs);return a(r)?o*r:null}},s={},p={start:{default:0,validate:function(e){return!1===e?e:a(e)&&e>=0?e:0}},end:{default:!1,validate:function(e){if(!1===e)return e;if(a(e)){var t=r.duration();if(void 0===t||0===t){if(e>=0)return e}else{if(e>=0&&e<=t)return e;if(e>t)return t}}return!1}},enabled:{default:!1,validate:u},loopIfBeforeStart:{default:!0,validate:u},loopIfAfterEnd:{default:!0,validate:u},pauseBeforeLooping:{default:!1,validate:u},pauseAfterLooping:{default:!1,validate:u}},d={onLoopCallBack:{default:void 0,check:i},onOptionsChange:{default:void 0,check:i}},g=Object.keys(p),h=Object.keys(d),L=function(){return g.forEach(function(e){s[e]=p[e].validate(s[e])}),H},v=function(){return m(o,!0)},m=function(e,t){return g.forEach(function(n){(t||void 0!==e[n])&&(s[n]=e[n])}),L(),H},y=!1,b=function(e){return e?s.pauseBeforeLooping&&!1===y?(r.pause(),y=!0):(y=!1,r.currentTime(s.start),s.pauseAfterLooping&&r.pause(),d.onLoopCallBack.check(H.onLoopCallBack)&&H.onLoopCallBack(H,r)):(y=!1,r.currentTime(s.start)),H},U=function(e){return function(t){return!1===t?s[e]=!1:(void 0!==t&&(t=l(t)),null!==t&&(t=void 0===t?r.currentTime():t,s[e]=t)),H}},E=function(e){return function(t){return t=l(t),a(t)&&(s[e]+=t),H}},A=function(){return s.enabled=!0,H},B=function(e){return function(){return s[e]=!s[e],H}},O=function(e){(e=e||{}).decimalPlaces=Math.floor(e.decimalPlaces)||3;var t=!1!==s.start?parseFloat(s.start):0,n="#t="+c(t,e.decimalPlaces);if(!1!==s.end){var o=parseFloat(s.end);n+=","+c(o,e.decimalPlaces)}return n},k=function(e){e=e||{};var t=r.currentSrc();return t.src&&(t=t.src),t+O(e)},S=function(e){if("string"==typeof e&&(e=t.parseUrl(e)),e.hash){var n=/^(#?t=)?([^,]*)(,(.*))?$/,o=e.hash.replace(n,"$2"),r=e.hash.replace(n,"$4");o=l(o),r=l(r),a(o)&&(s.start=parseFloat(o)),a(r)&&(s.end=parseFloat(r))}return H},P=function(e){var t,n,o=e;return"string"==typeof e?o=[e]:void 0!==e&&Array.isArray(e)||(o=null!==e&&"object"==typeof e?Object.keys(e):Object.keys(p)),t=s,n={},o.forEach(function(e){void 0!==t[e]&&(n[e]=t[e])}),n},T=function(e,t){var n=!t;return t=t||{},g.forEach(function(e){t[e]=!!t[e]||n}),function(){var n=arguments,o=P(),a=e.apply(null,n),i={changed:t,oldOpts:o,newOpts:P()};return H.onOptionsChange&&H.onOptionsChange(i,H,r),q(t),a}},F=!1,x=function(){var e,t,n;if(L(),e=r.currentTime(),t=C(),(n=j())>t){if(F=!0,e<n-.5&&e>t&&(e-t<1||s.loopIfAfterEnd||s.loopIfBeforeStart))return!0}else{if(F=!1,e<n-.5&&s.loopIfBeforeStart)return!0;if(e>=t&&(e-t<1||s.loopIfAfterEnd))return!0}return!1},j=function(){return!1===s.start?0:s.start},C=function(){return!1===s.end?r.duration():s.end},K=!1,w=a(o.minLoopLength)&&o.minLoopLength>0?o.minLoopLength:200,$=function(e){!K&&s.enabled&&!r.paused()&&x()&&(K=!0,setTimeout(function(){K=!1},w),b(!0))},I={},M=[{name:"start",optionsUsed:["start"],leftclick:function(e,t){t.shiftKey?e.adjustStart(-.5):e.setStart()},rightclick:function(e,t){t.shiftKey?e.adjustStart(.5):e.goToStart()},defaultText:"Start",textFunction:function(e){return f(e.start)}},{name:"end",optionsUsed:["end"],leftclick:function(e,t){t.shiftKey?e.adjustEnd(-.5):t.ctrlKey?e.adjustEnd(-.05):e.setEnd()},rightclick:function(e,t){t.shiftKey?e.adjustEnd(.5):t.ctrlKey?e.adjustEnd(.05):e.goToEnd()},defaultText:"End",textFunction:function(e){return f(e.end)}},{name:"enabled",optionsUsed:["enabled","pauseAfterLooping","pauseBeforeLooping"],leftclick:function(t,n){e&&e.prompt?n.ctrlKey?t.applyUrl(N("Set new URL",t.getAbsoluteUrl())):n.altKey?t.applyUrl(N("Set new URL",t.getUrl())):n.shiftKey?t.applyUrlFragment(N("Set new URL fragment",t.getUrlFragment())):t.toggle():t.toggle()},rightclick:function(t,n){var o;e&&e.prompt&&(n.ctrlKey?o=t.getAbsoluteUrl():n.altKey?o=t.getUrl():n.shiftKey&&(o=t.getUrlFragment())),o?R(o):t.cyclePauseOnLooping()},defaultText:"Loop",textFunction:function(e){return e.enabled?e.pauseBeforeLooping&&e.pauseAfterLooping?"PAUSE LOOP PAUSE":e.pauseAfterLooping?"LOOP& PAUSE":e.pauseBeforeLooping?"PAUSE &LOOP":"LOOP ON":"Loop off"}}],R=function(t){e&&e.prompt&&e.prompt("Copy to clipboard: Ctrl+C, Enter",t)},N=function(t,n){return!(!e||!e.prompt)&&e.prompt(t,n)},D=function(e){e.forEach(function(e){var t,n,o,a,i,u;void 0===I[e.name]&&(I[e.name]=(t=e,i=function(e,t){return function(o){(void 0===t||o.which&&o.which==t)&&(e(n.abLoopPlugin,o),this.updateText())}},u=(n=r).controlBar.addChild("Button"),t.leftclick&&u.on("click",i(t.leftclick)),t.rightclick&&(u.el().onmousedown=i(t.rightclick,3).bind(u),u.on("contextmenu",function(e){return e.preventDefault&&e.preventDefault(),e.preventDefault&&e.stopPropagation(),!1})),u.updateText=(o=t.defaultText,a=t.textFunction,function(){var e=a(s)||o;this.el().textContent=e}),u.optionsUsed=t.optionsUsed,u.addClass("abLoopButton"),u.addClass(t.name),u.updateText(),u))})},q=function(e){var t=function(t,n){return t||e[n]};for(var n in I){var o=I[n];(!o.optionsUsed||o.optionsUsed.reduce(t,!1))&&o.updateText()}},H={validateOptions:T(L),resetToInitialOptions:T(v),setOptions:T(m),getOptions:P,goToStart:b,goToEnd:function(){return y=!1,r.currentTime(s.end),H},setStart:T(U("start"),{start:!0}),setEnd:T(U("end"),{end:!0}),adjustStart:T(E("start"),{start:!0}),adjustEnd:T(E("end"),{end:!0}),enable:T(A,{enabled:!0}),disable:T(function(){return s.enabled=!1,H},{enabled:!0}),toggle:T(B("enabled"),{enabled:!0}),togglePauseAfterLooping:T(B("pauseAfterLooping"),{pauseAfterLooping:!0}),togglePauseBeforeLooping:T(B("pauseBeforeLooping"),{pauseBeforeLooping:!0}),cyclePauseOnLooping:T(function(){var e=s.pauseAfterLooping,t=s.pauseBeforeLooping;return m(e||t?e&&!t?{pauseAfterLooping:!1,pauseBeforeLooping:!0}:!e&&t?{pauseAfterLooping:!0,pauseBeforeLooping:!0}:{pauseAfterLooping:!1,pauseBeforeLooping:!1}:{pauseAfterLooping:!0,pauseBeforeLooping:!1}),H},{pauseBeforeLooping:!0,pauseAfterLooping:!0}),player:r,version:n,getAbsoluteUrl:function(t){return function(t){if(!t.match(/^https?:\/\//)&&e&&e.document){var n=e.document.createElement("div");n.innerHTML='<a href="'+t+'">x</a>',t=n.firstChild.href}return t}(k(t))},getUrl:k,getUrlFragment:O,applyUrl:T(function(e){var t=e.replace(/^(.*?)(#.*)?$/,"$1"),n=e.replace(/^(.*?)(#.*)?$/,"$2"),o=r.currentSrc();return o!=t&&o!=e&&e!=n&&r.src(t),n&&S(n),H},{start:!0,end:!0}),applyUrlFragment:T(S,{start:!0,end:!0}),loopRequired:x,playLoop:T(function(){return L(),b(!1),A(),r.play(),H})};return function(){o=o||{};var e=function(e){return function(t){void 0===o[t]&&(o[t]=e[t].default)}};g.forEach(e(p)),h.forEach(e(d))}(),h.forEach(function(e){d[e].check(o[e])&&(H[e]=o[e])}),T(v)(),r.ready(function(){0!=o.createButtons&&D(M),r.on("ended",function(){F&&s.enabled&&!r.loop()&&r.play()})}),r.abLoopPlugin=H,r.on("timeupdate",$),H.loaded=!0,H};return o.loaded=!1,o.VERSION=n,(t.registerPlugin||t.plugin)("abLoopPlugin",o)});
\ No newline at end of file
+!function(e,t){"function"==typeof define&&define.amd?define([],t.bind(this,e,e.videojs)):"undefined"!=typeof module&&module.exports?module.exports=t(e,e.videojs):t(e,e.videojs)}(window,function(q,H){"use strict";function e(n){function a(e){return!isNaN(parseFloat(e))&&isFinite(e)}function e(e){return e&&"[object Function]"==={}.toString.call(e)}function t(e){return!!e}function o(e,t){return t=t||1,H.formatTime(e)+"."+Math.floor(e%1*Math.pow(10,t))}function r(e,t){var n=Math.pow(10,t);return Math.floor(e*n)/n}function i(e){if(void 0!==e){if(a(e))return e;if(/^([+\-])?([\d\.]+)$/i.test(e))return parseFloat(e);var t=/^([+\-])?((([\d]+)(h|:(?=.*:)))?(([\d]+)(m|:|$))?)?(([\d\.]+)s?)?$/i.exec(e);if(!t)return null;var n={match:t[0],sign:t[1],hours:t[4]||0,mins:t[7]||0,secs:t[10]||0},o="-"==n.sign?-1:1,r=60*parseFloat(n.hours)*60+60*parseFloat(n.mins)+parseFloat(n.secs);return a(r)?o*r:null}}function u(){function e(t){return function(e){void 0===n[e]&&(n[e]=t[e].default)}}n=n||{},O.forEach(e(A)),k.forEach(e(B))}function f(){return O.forEach(function(e){E[e]=A[e].validate(E[e])}),D}function c(){return S(n,!0)}function l(e){return e?E.pauseBeforeLooping&&!1===P?(U.pause(),P=!0):(P=!1,U.currentTime(E.start),E.pauseAfterLooping&&U.pause(),B.onLoopCallBack.check(D.onLoopCallBack)&&D.onLoopCallBack(D,U)):(P=!1,U.currentTime(E.start)),D}function p(t){return function(e){return!1===e?E[t]=!1:(void 0!==e&&(e=i(e)),null!==e&&(e=void 0===e?U.currentTime():e,E[t]=e)),D}}function s(t){return function(e){return e=i(e),a(e)&&(E[t]+=e),D}}function d(e){return function(){return E[e]=!E[e],D}}function g(e){(e=e||{}).decimalPlaces=Math.floor(e.decimalPlaces)||3;var t=!1!==E.start?parseFloat(E.start):0,n="#t="+r(t,e.decimalPlaces);if(!1!==E.end){var o=parseFloat(E.end);n+=","+r(o,e.decimalPlaces)}return n}function h(e){if("string"==typeof e&&(e=H.parseUrl(e)),e.hash){var t=/^(#?t=)?([^,]*)(,(.*))?$/,n=e.hash.replace(t,"$2"),o=e.hash.replace(t,"$4");n=i(n),o=i(o),a(n)&&(E.start=parseFloat(n)),a(o)&&(E.end=parseFloat(o))}return D}function L(e){var t,n,o=e;return"string"==typeof e?o=[e]:void 0!==e&&Array.isArray(e)||(o=null!==e&&"object"==typeof e?Object.keys(e):Object.keys(A)),t=E,n={},o.forEach(function(e){void 0!==t[e]&&(n[e]=t[e])}),n}function v(r,a){var t=!a;return a=a||{},O.forEach(function(e){a[e]=!!a[e]||t}),function(){var e=arguments,t=L(),n=r.apply(null,e),o={changed:a,oldOpts:t,newOpts:L()};return D.onOptionsChange&&D.onOptionsChange(o,D,U),N(a),n}}function m(){var e,t,n;if(f(),e=U.currentTime(),(t=C())<(n=j())){if(x=!0,e<n-.5&&t<e&&(e-t<1||E.loopIfAfterEnd||E.loopIfBeforeStart))return!0}else{if(x=!1,e<n-.5&&E.loopIfBeforeStart)return!0;if(t<=e&&(e-t<1||E.loopIfAfterEnd))return!0}return!1}function y(e){!K&&E.enabled&&!U.paused()&&m()&&(K=!0,setTimeout(function(){K=!1},w),l(!0))}function b(e,o){function t(t,n){return function(e){(void 0===n||e.which&&e.which==n)&&(t(o.abLoopPlugin,e),this.updateText())}}var n,r,a=o.controlBar.addChild("Button");return e.leftclick&&a.on("click",t(e.leftclick)),e.rightclick&&(a.el().onmousedown=t(e.rightclick,3).bind(a),a.on("contextmenu",function(e){return e.preventDefault&&e.preventDefault(),e.preventDefault&&e.stopPropagation(),!1})),a.updateText=(n=e.defaultText,r=e.textFunction,function(){var e=r(E)||n;this.el().textContent=e}),a.optionsUsed=e.optionsUsed,a.addClass("abLoopButton"),a.addClass(e.name),a.updateText(),a}n=n||{};var U=this,E={},A={start:{default:0,validate:function(e){return!1===e||a(e)&&0<=e?e:0}},end:{default:!1,validate:function(e){if(!1===e)return e;if(a(e)){var t=U.duration();if(0!==t&&a(t))return 0<=e&&e<=t?e:t<e?t:e;if(0<=e)return e}return!1}},enabled:{default:!1,validate:t},loopIfBeforeStart:{default:!0,validate:t},loopIfAfterEnd:{default:!0,validate:t},pauseBeforeLooping:{default:!1,validate:t},pauseAfterLooping:{default:!1,validate:t}},B={onLoopCallBack:{default:void 0,check:e},onOptionsChange:{default:void 0,check:e}},O=Object.keys(A),k=Object.keys(B),S=function(t,n){return O.forEach(function(e){!n&&void 0===t[e]||(E[e]=t[e])}),f(),D},P=!1,T=function(){return E.enabled=!0,D},F=function(e){e=e||{};var t=U.currentSrc();return t.src&&(t=t.src),t+g(e)},x=!1,j=function(){return!1===E.start?0:E.start},C=function(){return!1===E.end?U.duration():E.end},K=!1,w=a(n.minLoopLength)&&0<n.minLoopLength?n.minLoopLength:200,$={},I=[{name:"start",optionsUsed:["start"],leftclick:function(e,t){t.shiftKey?e.adjustStart(-.5):e.setStart()},rightclick:function(e,t){t.shiftKey?e.adjustStart(.5):e.goToStart()},defaultText:"Start",textFunction:function(e){return o(e.start)}},{name:"end",optionsUsed:["end"],leftclick:function(e,t){t.shiftKey?e.adjustEnd(-.5):t.ctrlKey?e.adjustEnd(-.05):e.setEnd()},rightclick:function(e,t){t.shiftKey?e.adjustEnd(.5):t.ctrlKey?e.adjustEnd(.05):e.goToEnd()},defaultText:"End",textFunction:function(e){return o(e.end)}},{name:"enabled",optionsUsed:["enabled","pauseAfterLooping","pauseBeforeLooping"],leftclick:function(e,t){q&&q.prompt?t.ctrlKey?e.applyUrl(R("Set new URL",e.getAbsoluteUrl())):t.altKey?e.applyUrl(R("Set new URL",e.getUrl())):t.shiftKey?e.applyUrlFragment(R("Set new URL fragment",e.getUrlFragment())):e.toggle():e.toggle()},rightclick:function(e,t){var n;q&&q.prompt&&(t.ctrlKey?n=e.getAbsoluteUrl():t.altKey?n=e.getUrl():t.shiftKey&&(n=e.getUrlFragment())),n?M(n):e.cyclePauseOnLooping()},defaultText:"Loop",textFunction:function(e){return e.enabled?e.pauseBeforeLooping&&e.pauseAfterLooping?"PAUSE LOOP PAUSE":e.pauseAfterLooping?"LOOP& PAUSE":e.pauseBeforeLooping?"PAUSE &LOOP":"LOOP ON":"Loop off"}}],M=function(e){q&&q.prompt&&q.prompt("Copy to clipboard: Ctrl+C, Enter",e)},R=function(e,t){return!(!q||!q.prompt)&&q.prompt(e,t)},N=function(n){function e(e,t){return e||n[t]}for(var t in $){var o=$[t];(!o.optionsUsed||o.optionsUsed.reduce(e,!1))&&o.updateText()}},D={validateOptions:v(f),resetToInitialOptions:v(c),setOptions:v(S),getOptions:L,goToStart:l,goToEnd:function(){return P=!1,U.currentTime(E.end),D},setStart:v(p("start"),{start:!0}),setEnd:v(p("end"),{end:!0}),adjustStart:v(s("start"),{start:!0}),adjustEnd:v(s("end"),{end:!0}),enable:v(T,{enabled:!0}),disable:v(function(){return E.enabled=!1,D},{enabled:!0}),toggle:v(d("enabled"),{enabled:!0}),togglePauseAfterLooping:v(d("pauseAfterLooping"),{pauseAfterLooping:!0}),togglePauseBeforeLooping:v(d("pauseBeforeLooping"),{pauseBeforeLooping:!0}),cyclePauseOnLooping:v(function(){var e=E.pauseAfterLooping,t=E.pauseBeforeLooping;return S(e||t?e&&!t?{pauseAfterLooping:!1,pauseBeforeLooping:!0}:!e&&t?{pauseAfterLooping:!0,pauseBeforeLooping:!0}:{pauseAfterLooping:!1,pauseBeforeLooping:!1}:{pauseAfterLooping:!0,pauseBeforeLooping:!1}),D},{pauseBeforeLooping:!0,pauseAfterLooping:!0}),player:U,version:V,getAbsoluteUrl:function(e){return function(e){if(!e.match(/^https?:\/\//)&&q&&q.document){var t=q.document.createElement("div");t.innerHTML='<a href="'+e+'">x</a>',e=t.firstChild.href}return e}(F(e))},getUrl:F,getUrlFragment:g,applyUrl:v(function(e){var t=e.replace(/^(.*?)(#.*)?$/,"$1"),n=e.replace(/^(.*?)(#.*)?$/,"$2"),o=U.currentSrc();return o!=t&&o!=e&&e!=n&&U.src(t),n&&h(n),D},{start:!0,end:!0}),applyUrlFragment:v(h,{start:!0,end:!0}),loopRequired:m,playLoop:v(function(){return f(),l(!1),T(),U.play(),D})};return u(),k.forEach(function(e){B[e].check(n[e])&&(D[e]=n[e])}),v(c)(),U.ready(function(){0!=n.createButtons&&I.forEach(function(e){void 0===$[e.name]&&($[e.name]=b(e,U))}),U.on("ended",function(){x&&E.enabled&&!U.loop()&&U.play()})}),U.abLoopPlugin=D,U.on("timeupdate",y),D.loaded=!0,D}var V="1.0.2";return e.loaded=!1,e.VERSION=V,(H.registerPlugin||H.plugin)("abLoopPlugin",e)});
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index d2b22d4..f9b18f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,88 +1,137 @@
 {
   "name": "videojs-abloop",
-  "version": "0.4.5",
+  "version": "1.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "adm-zip": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
+      "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
+      "requires": {
+        "es6-promisify": "^5.0.0"
+      }
+    },
     "assertion-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
     },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz",
+      "integrity": "sha1-AdqNgh2HgT0ViWfnQ9X+bGLPjA8=",
+      "dev": true
     },
     "brace-expansion": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.9.tgz",
-      "integrity": "sha512-/+o3o6OV1cm3WKrO7U4wykU+ZICE6HiMEuravc2d03NIuM/VaRn5iMcoQ7NyxFXjvpmRICP2EER0YOnh4yIapA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "browser-stdout": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
+      "dev": true
     },
     "chai": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
-      "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
       "requires": {
-        "assertion-error": "1.1.0",
-        "check-error": "1.0.2",
-        "deep-eql": "3.0.1",
-        "get-func-name": "2.0.0",
-        "pathval": "1.1.0",
-        "type-detect": "4.0.8"
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
       }
     },
     "chai-as-promised": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
       "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "dev": true,
       "requires": {
-        "check-error": "1.0.2"
+        "check-error": "^1.0.2"
       }
     },
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "chownr": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+      "dev": true
     },
     "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
     },
     "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "core-js": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
-      "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "dev": true,
+      "requires": {
+        "capture-stack-trace": "^1.0.0"
+      }
     },
     "debug": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
       "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -91,324 +140,641 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
       "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
       "requires": {
-        "type-detect": "4.0.8"
+        "type-detect": "^4.0.0"
       }
     },
     "diff": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
     },
     "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
     },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "geckodriver": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-1.19.1.tgz",
+      "integrity": "sha512-xWL/+eEhQ6+t98rc1c+xVM3hshDJibXtZf9WJA3sshxq4k5L1PBwfmswyBmmlKUfBr4xuC256gLVC2RxFhiCsQ==",
+      "dev": true,
+      "requires": {
+        "adm-zip": "0.4.11",
+        "bluebird": "3.4.6",
+        "got": "5.6.0",
+        "https-proxy-agent": "3.0.0",
+        "tar": "4.4.2"
+      }
     },
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
     },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "got": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz",
+      "integrity": "sha1-ux1+4WO3gIK7yOuDbz85UATqb78=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "^3.0.1",
+        "duplexer2": "^0.1.4",
+        "is-plain-obj": "^1.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "node-status-codes": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "parse-json": "^2.1.0",
+        "pinkie-promise": "^2.0.0",
+        "read-all-stream": "^3.0.0",
+        "readable-stream": "^2.0.5",
+        "timed-out": "^2.0.0",
+        "unzip-response": "^1.0.0",
+        "url-parse-lax": "^1.0.0"
       }
     },
     "growl": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
-      "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q=="
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
     },
     "has-flag": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
     },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
     },
     "http-shutdown": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-shutdown/-/http-shutdown-1.2.0.tgz",
-      "integrity": "sha1-3y2AZ6iFbpnRHp3OshYJWR4d9RQ="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/http-shutdown/-/http-shutdown-1.2.2.tgz",
+      "integrity": "sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz",
+      "integrity": "sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      }
     },
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "dev": true
+    },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
     },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "jszip": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
-      "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz",
+      "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==",
+      "dev": true,
       "requires": {
-        "core-js": "2.3.0",
-        "es6-promise": "3.0.2",
-        "lie": "3.1.1",
-        "pako": "1.0.6",
-        "readable-stream": "2.0.6"
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
       }
     },
     "lie": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
       "requires": {
-        "immediate": "3.0.6"
+        "immediate": "~3.0.5"
       }
     },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "requires": {
-        "brace-expansion": "1.1.9"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.9.0"
+      }
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
     },
     "mocha": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz",
-      "integrity": "sha512-ukB2dF+u4aeJjc6IGtPNnJXfeby5d4ZqySlIBT0OEyva/DrMjVm5HkQxKnHDLKEfEQBsEnwTg9HHhtPHJdTd8w==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "dev": true,
       "requires": {
-        "browser-stdout": "1.3.0",
-        "commander": "2.11.0",
+        "browser-stdout": "1.3.1",
+        "commander": "2.15.1",
         "debug": "3.1.0",
-        "diff": "3.3.1",
+        "diff": "3.5.0",
         "escape-string-regexp": "1.0.5",
         "glob": "7.1.2",
-        "growl": "1.10.3",
+        "growl": "1.10.5",
         "he": "1.1.1",
+        "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
-        "supports-color": "4.4.0"
+        "supports-color": "5.4.0"
       }
     },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
     "node-static": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz",
-      "integrity": "sha512-bd7zO5hvCWzdglgwz9t82T4mYTEUzEG5pXnSqEzitvmEacusbhl8/VwuCbMaYR9g2PNK5191yBtAEQLJEmQh1A==",
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/node-static/-/node-static-0.7.11.tgz",
+      "integrity": "sha512-zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ==",
+      "dev": true,
       "requires": {
-        "colors": "1.1.2",
-        "mime": "1.6.0",
-        "optimist": "0.6.1"
+        "colors": ">=0.6.0",
+        "mime": "^1.2.9",
+        "optimist": ">=0.3.4"
       }
     },
+    "node-status-codes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
       "requires": {
-        "minimist": "0.0.8",
-        "wordwrap": "0.0.3"
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
       }
     },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
     },
     "pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "pathval": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA="
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
     },
     "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "^2.0.0",
+        "readable-stream": "^2.0.0"
+      }
     },
     "readable-stream": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-      "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "string_decoder": "0.10.31",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.1.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
       }
     },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "selenium": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/selenium/-/selenium-2.20.0.tgz",
+      "integrity": "sha1-9RWxoWLek8LM7y/AyjPztVQ+OMg=",
+      "dev": true
     },
     "selenium-webdriver": {
-      "version": "4.0.0-alpha.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.1.tgz",
-      "integrity": "sha512-z88rdjHAv3jmTZ7KSGUkTvo4rGzcDGMq0oXWHNIDK96Gs31JKVdu9+FMtT4KBrVoibg8dUicJDok6GnqqttO5Q==",
+      "version": "4.0.0-alpha.5",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.5.tgz",
+      "integrity": "sha512-hktl3DSrhzM59yLhWzDGHIX9o56DvA+cVK7Dw6FcJR6qQ4CGzkaHeXQPcdrslkWMTeq0Ci9AmCxq0EMOvm2Rkg==",
+      "dev": true,
       "requires": {
-        "jszip": "3.1.5",
-        "rimraf": "2.6.2",
+        "jszip": "^3.1.5",
+        "rimraf": "^2.6.3",
         "tmp": "0.0.30",
-        "xml2js": "0.4.19"
+        "xml2js": "^0.4.19"
       }
     },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
     },
     "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "supports-color": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-      "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tar": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz",
+      "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
+      "dev": true,
       "requires": {
-        "has-flag": "2.0.0"
+        "chownr": "^1.0.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.2.4",
+        "minizlib": "^1.1.0",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.2"
       }
     },
+    "timed-out": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
+      "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=",
+      "dev": true
+    },
     "tmp": {
       "version": "0.0.30",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
       "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+      "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.1"
       }
     },
     "type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
     },
     "uglify-js": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.10.tgz",
-      "integrity": "sha512-dNib7aUDNZFJNTXFyq0CDmLRVOsnY1F+IQgt2FAOdZFx2+LvKVLbbIb/fL+BYKCv3YH3bPCE/6M/JaxChtQLHQ==",
+      "version": "3.7.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.6.tgz",
+      "integrity": "sha512-yYqjArOYSxvqeeiYH2VGjZOqq6SVmhxzaPjJC1W2F9e+bqvFL9QXQ2osQuKUFjM2hGjKG2YclQnRKWQSt/nOTQ==",
+      "dev": true,
       "requires": {
-        "commander": "2.14.1",
-        "source-map": "0.6.1"
+        "commander": "~2.20.3",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
         }
       }
     },
+    "unzip-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
+      "dev": true
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^1.0.1"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "xml2js": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "dev": true,
       "requires": {
-        "sax": "1.2.4",
-        "xmlbuilder": "9.0.7"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
       }
     },
     "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
     }
   }
 }
diff --git a/package.json b/package.json
index 51489e6..4c1c16a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "videojs-abloop",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A video.js plugin allowing looping of a section of video, with GUI and API interface",
   "main": "videojs-abloop.js",
   "scripts": {
@@ -21,13 +21,16 @@
     "url": "https://github.com/phhu/videojs-abloop/issues"
   },
   "homepage": "https://github.com/phhu/videojs-abloop#readme",
-  "dependencies": {
-    "chai": "^4.1.2",
+  "dependencies": {},
+  "devDependencies": {
+    "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "http-shutdown": "^1.2.0",
-    "mocha": "^5.0.0",
-    "node-static": "^0.7.7",
-    "selenium-webdriver": "^4.0.0-alpha.1",
-    "uglify-js": "^3.3.10"
+    "geckodriver": "^1.19.1",
+    "http-shutdown": "^1.2.2",
+    "mocha": "^5.2.0",
+    "node-static": "^0.7.11",
+    "selenium": "^2.20.0",
+    "selenium-webdriver": "^4.0.0-alpha.5",
+    "uglify-js": "^3.7.6"
   }
 }
diff --git a/sample/index.html b/sample/index.html
index 751cb0d..cbdfbea 100644
--- a/sample/index.html
+++ b/sample/index.html
@@ -1,7 +1,13 @@
 <!DOCTYPE html>
+
 <html>
 <head>
-	<link href="video-js.css" rel="stylesheet">  <!-- http://vjs.zencdn.net/5.6.0/ -->
+	<meta charset="utf-8"/>
+	<link href="https://vjs.zencdn.net/7.6.6/video-js.css" rel="stylesheet" />
+	<!--
+		<link href="video-js.css" rel="stylesheet">  
+		http://vjs.zencdn.net/5.6.0/ 
+	-->
 	<link href="video-js-extra.css" rel="stylesheet">
 	<title>AB loop test page</title>
 </head>
@@ -9,8 +15,8 @@
 <body id="body">
 	<h2>AB loop test page</h2>
 	<!-- data-setup='{ "controlBar": { "children": { "volumeMenuButton": { "volumeBar": { "vertical": true } }, "muteToggle": false, "volumeControl": false }}} -->
-	First video: should play automatically from start, then loop once between 2 and 8 seconds before pausing
-	<video id="video0" class="video-js" controls preload="auto"  width="640" height="264"
+	First video: should play automatically from start to 5 secs, then loop once between 2 and 8 seconds before pausing
+	<video id="video0" class="video-js" controls preload="auto"  width="640" height="264" muted autoplay
 	  poster="http://vjs.zencdn.net/v/oceans.png" >
 		<source src="http://vjs.zencdn.net/v/oceans.mp4" type='video/mp4'>
 		<source src="http://vjs.zencdn.net/v/oceans.webm" type='video/webm'>
@@ -21,15 +27,21 @@ <h2>AB loop test page</h2>
 	<br />
 	
 	Second video - should default to looping between 20 and 25 seconds when played:
-	<video id="video1" class="video-js" controls preload="auto"  width="640" height="264"
+	<video id="video1" class="video-js" controls preload="auto"  width="640" height="264" muted
 	  poster="http://vjs.zencdn.net/v/oceans.png">
 		<source src="http://vjs.zencdn.net/v/oceans.mp4" type='video/mp4'>
 		<source src="http://vjs.zencdn.net/v/oceans.webm" type='video/webm'>
 		<source src="http://vjs.zencdn.net/v/oceans.ogv" type='video/ogg'>
 		<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
 	</video>
-
-	<script src="http://vjs.zencdn.net/5.6.0/video.js"></script>
+	Third video - no source:
+	<video id="video2" class="video-js" controls preload="auto"  width="640" height="264" muted autoplay
+	  poster="http://vjs.zencdn.net/v/oceans.png">
+	</video>
+	<!--
+		<script src="http://vjs.zencdn.net/5.6.0/video.js"></script>
+	-->
+	<script src="https://vjs.zencdn.net/7.6.6/video.js"></script>
 	<script src="../videojs-abloop.js"></script>
 
 	<script>
@@ -37,6 +49,7 @@ <h2>AB loop test page</h2>
 	
 		videos = [
 			videojs("video0",{
+				//autoplay:true,
 				plugins: {
 					abLoopPlugin: {
 						start:0    //seconds
@@ -46,13 +59,20 @@ <h2>AB loop test page</h2>
 						,loopIfAfterEnd:true
 						,pauseOnLoop: false     //if true, after looping video will pause
 						,createButtons: true
-						,onOptionsChange: function(optionDetails,api,player){console.log("options changed: ", optionDetails);}
+						,onOptionsChange: function(optionDetails,api,player){
+							console.log("options changed: ", player.id(), optionDetails);
+						}
 					}
 				}
 			}),
-			videojs("video1")
+			videojs("video1"),
+			videojs("video2")
 		];
 		
+		/*videos[0].addEventListener('durationchange', function() {
+    	console.log('Duration change', videos[0].duration);
+		});*/		
+
 		//initialisation via ready event
 		videos[1].ready(function(){
 			this.abLoopPlugin({
@@ -61,23 +81,30 @@ <h2>AB loop test page</h2>
 				,enabled:true
 			});
 		});
-		
 		//start the first video
-		videos[0].play();
-
+		videos[0].ready(function(){
+				var playPromise = videos[0].play()
+						.then(res=>console.log("ready play",res))
+						.catch(err => console.error(err));
+				console.log(
+					"ready / attempting to play video0",playPromise
+				);
+		})
+		
 		//add a callback to be called when the loop happens
 		videos[0].abLoopPlugin.onLoopCallBack = function(plugin,player){
 			var opts = this.getOptions();
-			console.log("Looping back to %s sec on %s",opts.start, this.player.currentSrc() );
+			console.log("Looping back to %s sec on %s",opts.start, player.id(), this.player.currentSrc() );
 			plugin.setOptions({pauseAfterLooping:true}); 
 		};
 
 		//set properties dynamically
+		//*
 		setTimeout(function() { 
-			console.log("setting new start and end...");
+			console.log("setting new start and end on videos[0]...");
 			videos[0].abLoopPlugin.setStart().setEnd(8).enable();
-		} , 2000);
-		
+		} , 2500);
+		//*/
 	</script>
 
 </body>
diff --git a/sample/sampleWithHotkey.html b/sample/sampleWithHotkey.html
index 04a201b..87e1080 100644
--- a/sample/sampleWithHotkey.html
+++ b/sample/sampleWithHotkey.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<link href="video-js.css" rel="stylesheet">
-	<title>AB loop test page</title>
+	<title>AB loop hotkey examples</title>
 	<style>
 	button.vjs-control.vjs-button.abLoopButton {
 		xbackground: linear-gradient(45deg, rgba(0,0,255,.3) 15%, transparent);
@@ -11,12 +11,26 @@
 </head>
 
 <body>
-	<h2>AB loop test page</h2>
+	<h2>AB loop hotkey examples</h2>
 
-	<video id="video0" class="video-js" controls preload="auto"  width="640" height="264"
-	  poster="//vjs.zencdn.net/v/oceans.png" data-setup='{"controlBar": { "currentTimeDisplay": true,"muteToggle": false },"fluid": false,"playbackRates": [0.1, 0.2, 0.5, 1, 2, 5]}'>
+	<video 
+		id="video0" 
+		class="video-js" 
+		controls 
+		preload="auto"  
+		width="640"
+		height="264"
+	  poster="//vjs.zencdn.net/v/oceans.png" 
+		data-setup='
+			{	"controlBar": { 
+					"currentTimeDisplay": true
+					,"muteToggle": false 
+				}
+				,"fluid": false,
+				"playbackRates": [0.1, 0.2, 0.5, 1, 2, 5]
+			}'
+	>
 		<source src="oceans.mp4" type='video/mp4'>
-
 	</video>
 	
 	<br />
@@ -41,11 +55,14 @@ <h2>AB loop test page</h2>
 			});*/
 			spec.modifiers = spec.modifiers || {};
 			
+			//allow letters as well as codes
+			var key = typeof spec.key === "string" ? spec.key.charCodeAt() : spec.key;
+			
 			return {
 				key: function(e) {
 					//console.log(e.which);
 					return (
-						(e.which === spec.key ) && 
+						(e.which === key ) && 
 						(!!spec.modifiers.ctrl === !!e.ctrlKey) &&
 						(!!spec.modifiers.shift === !!e.shiftKey) &&
 						(!!spec.modifiers.alt === !!e.altKey) &&
@@ -75,17 +92,15 @@ <h2>AB loop test page</h2>
 				}
 			};
 		};
+		var loopSetting = function(funcName, args){
+			return function(player){
+			  //console.log(funcName,args);
+				player.abLoopPlugin[funcName].apply(null,args);
+			};
+		};
 		
 		videos = [
-			videojs("video0"/*,{
-				plugins: {
-
-				}	
-				,cxxontrolBar: {
-					CurrentTimeDisplay: true
-					,muteToggle: false
-				}
-			}*/)
+			videojs("video0")
 		];
 		
 		videos[0].ready(function(){
@@ -97,39 +112,35 @@ <h2>AB loop test page</h2>
 				seekStep: 5,
 				alwaysCaptureHotkeys: true,
 				customKeys: {
-					slowDownArBr: hotKeySpec({key:188,handler:speedChange(-0.1)})	    // 188 = <
-					,speedUp: hotKeySpec({key:190,handler:speedChange(0.1)})	 	// 190 = >
-					,bigSlowDown: hotKeySpec({key:188,modifiers:{shift:true}, handler:speedChange(-0.5)})					
-					,bigSpeedUp: hotKeySpec({key:190,modifiers:{shift:true}, handler:speedChange(0.5)})
-					,normalSpeedN: hotKeySpec({key:78,handler:function(p){p.playbackRate(1);}})    // 78 = n
-					,smallSkipBackZ: hotKeySpec({key:90,handler:skip(-2)})    // 90 = z
-					,vSmallSkipBack: hotKeySpec({key:90,handler:skip(-0.5),modifiers:{shift:true}})   
-					,smallSkipForward: hotKeySpec({key:88,handler:skip(2)})    // 88 =x 
-					,vSmallSkipForward: hotKeySpec({key:88,handler:skip(0.5),modifiers:{shift:true}})    
-					,startLoopA: hotKeySpec({key:65,handler:function(p){p.abLoopPlugin.setStart();}})
-					,endLoopB: hotKeySpec({key:66,handler:function(p){p.abLoopPlugin.setEnd();}})
-					,incLoopStart: hotKeySpec({key:65,modifiers:{shift:true},handler:function(p){p.abLoopPlugin.adjustStart(0.1);}})
-					,decLoopStart: hotKeySpec({key:65,modifiers:{ctrl:true},handler:function(p){p.abLoopPlugin.adjustStart(-0.1);}})
-					,incLoopEnd: hotKeySpec({key:66,modifiers:{shift:true},handler:function(p){p.abLoopPlugin.adjustEnd(0.1);}})
-					,decLoopEnd: hotKeySpec({key:66,modifiers:{ctrl:true},handler:function(p){p.abLoopPlugin.adjustEnd(-0.1);}})
-					,enableLoopL:hotKeySpec({key:76,handler:function(p){p.abLoopPlugin.toggle();}})
-					,goToStartKeySqBr:hotKeySpec({key:219,handler:function(p){p.abLoopPlugin.goToStart();}})
-					,goToEndSqBr:hotKeySpec({key:221,handler:function(p){p.abLoopPlugin.goToEnd();}})
-					,togglePauseOnLoopK: hotKeySpec({key:75,handler:function(p){p.abLoopPlugin.cyclePauseOnLoopStatus();}})
+					slowDownArBr: 				hotKeySpec({key:188,handler:speedChange(-0.1)})	   //// 188 = < 190 = >
+					,speedUp: 						hotKeySpec({key:190,handler:speedChange( 0.1)})	 
+					,bigSlowDown: 				hotKeySpec({key:188,handler:speedChange(-0.5) ,modifiers:{shift:true}})					
+					,bigSpeedUp: 					hotKeySpec({key:190,handler:speedChange( 0.5) ,modifiers:{shift:true}})
+					,normalSpeedN: 				hotKeySpec({key:"N",handler:function(p){p.playbackRate(1);}})    
+					,smallSkipBackZ: 			hotKeySpec({key:"Z",handler:skip(-2)   })    
+					,vSmallSkipBack: 			hotKeySpec({key:"Z",handler:skip(-0.5), modifiers:{shift:true}})   
+					,smallSkipForward: 		hotKeySpec({key:"X",handler:skip(2)     })  
+					,vSmallSkipForward: 	hotKeySpec({key:"X",handler:skip(0.5),  modifiers:{shift:true}})    
+					,startLoopA: 					hotKeySpec({key:"A",handler:loopSetting('setStart')})
+					,endLoopB: 						hotKeySpec({key:"B",handler:loopSetting('setEnd')})
+					,incLoopStart: 				hotKeySpec({key:"A",handler:loopSetting('adjustStart',[ 0.1]),modifiers:{shift:true}})
+					,decLoopStart: 				hotKeySpec({key:"A",handler:loopSetting('adjustStart',[-0.1]),modifiers:{ctrl:true} })
+					,incLoopEnd: 					hotKeySpec({key:"B",handler:loopSetting('adjustEnd',  [ 0.1]),modifiers:{shift:true}})
+					,decLoopEnd: 					hotKeySpec({key:"B",handler:loopSetting('adjustEnd',  [-0.1]),modifiers:{ctrl:true} })
+					,enableLoopL:					hotKeySpec({key:"L",handler:loopSetting('toggle')})
+					,goToStartKeySqBr:		hotKeySpec({key:219,handler:loopSetting('goToStart')})  //  219 = { [
+					,goToEndSqBr:					hotKeySpec({key:221,handler:loopSetting('goToEnd')})    //  221 = } ]
+					,togglePauseOnLoopK: 	hotKeySpec({key:"K",handler:loopSetting('cyclePauseOnLooping')})
 				}					
 			});
 		});
 		//start the first video
 		videos[0].play();
-		
-		//create some buttons
-		//still need to add the icons and status change indication
-		
-
-
 
 	})();
 	</script>
 
+	<p>Ensure the video player as focus to use hotkeys. </p>
+	
 </body>
 </html>
diff --git a/test/videojs-abloop-test.js b/test/videojs-abloop-test.js
index 0c55575..94d2d81 100644
--- a/test/videojs-abloop-test.js
+++ b/test/videojs-abloop-test.js
@@ -1,4 +1,9 @@
+// check that geckodriver in path is up to date, otherwise you might get web driver errors 
+// also need to have video muted in the html
+
 var selenium = require('selenium-webdriver');
+//var chrome = require('selenium-webdriver/chrome');
+var firefox = require('selenium-webdriver/firefox');
 var chai = require('chai');
 var chaiAsPromised = require("chai-as-promised");
 chai.use(chaiAsPromised);
@@ -8,6 +13,7 @@ var static = require('node-static');
 var http = require('http');
 var port = 8081;
 
+const errorHandler = e=>console.error(e);
 
 //create a static server to serve out the samples 
 
@@ -27,16 +33,29 @@ describe('videojs-abloop', function() {
     //Open website and wait until abloop plugin loaded
     before(function(done) {
         this.timeout(30000);
-
-        this.driver = new selenium.Builder().
-            withCapabilities(selenium.Capabilities.firefox()).
-            build();
-        driver = this.driver;
-        driver.get('http://localhost:' + port + '/sample')
+        var url = 'http://localhost:' + port + '/sample';
+        let options = new firefox.Options();
+        
+        console.log("Attempting to open ", url);
+        //console.log(JSON.stringify(options,null,2));    
+        this.driver = new selenium.Builder()
+            .forBrowser('firefox')    
+            .setFirefoxOptions(options)
+            .build();
+        driver = this.driver;   // reference in parent closure
+        driver.get(url)
             .then(driver.wait(function () {
-                return driver.executeScript("return videos[0] != undefined && videos[0].abLoopPlugin != undefined && videos[0].abLoopPlugin.loaded;");
+                console.log("attempting to execute script to check if videojs and plugin loaded");
+                return driver.executeScript(
+                    `return videos[0] != undefined && 
+                        videos[0].abLoopPlugin != undefined && 
+                        videos[0].abLoopPlugin.loaded
+                    ;`
+                );
             }, 8000))
-            .then(function(){done()});
+            .then(function(){done()})
+            .catch(errorHandler)
+            ;
     });
     beforeEach(function(done) {
         done();
@@ -45,54 +64,119 @@ describe('videojs-abloop', function() {
 
     // Close the website after each test is run (so that it is opened fresh each time)
     after(function(done) {
-        httpServer.shutdown(function(){console.log("shut down http server");});
-		driver.quit().then(function(){done()});
+        console.log("Shutting down server");
+        //httpServer.shutdown(function(){console.log("shut down http server");});
+        driver
+            .quit()
+            .then(function(){done()})
+            .catch(errorHandler)
+            ;
     });
 
     it('Should be enablable', function() {
-        return driver.executeScript("return videos[0].abLoopPlugin.enable().getOptions().enabled;").should.eventually.equal(true);
+        return driver.executeScript(
+            "return videos[0].abLoopPlugin.enable().getOptions().enabled;"
+        ).should.eventually.equal(true);
     });
 
     it('Should go to start', function() {
-        return driver.executeScript("return videos[0].abLoopPlugin.setStart(5).goToStart().player.currentTime();").should.eventually.equal(5);
+        return driver.executeScript("return videos[0].abLoopPlugin.setStart(5).goToStart().player.currentTime();")
+            .should.eventually.equal(5);
     });
 
     it('Should go to end', function() {
-        return driver.executeScript("return videos[0].abLoopPlugin.setEnd(7).goToEnd().player.currentTime();").should.eventually.equal(7);
+        return driver.executeScript("return videos[0].abLoopPlugin.setEnd(7).goToEnd().player.currentTime();")
+            .should.eventually.equal(7);
     });
 
     it('Should apply URL fragments', function(done) {
-        driver.executeScript("return videos[0].abLoopPlugin.applyUrlFragment('#t=2,0:00:03').getOptions();").then(function(opts){ 
-            expect(opts.start).to.equal(2);
-            expect(opts.end).to.equal(3);
-            done();
-        });
+        driver.executeScript("return videos[0].abLoopPlugin.applyUrlFragment('#t=2,0:00:03').getOptions();")
+            .then(function(opts){ 
+                expect(opts.start).to.equal(2);
+                expect(opts.end).to.equal(3);
+                done();
+            })
+            .catch(errorHandler)
+        ;
     });
 
     it('Should return URL fragments', function() {
-        return driver.executeScript("return videos[1].abLoopPlugin.setStart(1).setEnd(\"0m4s\").getUrlFragment();").should.eventually.equal('#t=1,4');
+        return driver.executeScript("return videos[1].abLoopPlugin.setStart(1).setEnd(\"0m4s\").getUrlFragment();")
+            .should.eventually.equal('#t=1,4');
     });
-
+    it('Should report loaded false when no video supplied', function() {
+        return driver.executeScript("return videos[2].abLoopPlugin.loaded;")
+            .should.eventually.equal(false);
+    });
+    /*it('Should report duration zero when no video supplied', function() {
+        return driver.executeScript("return videos[2].player().duration();")
+            .should.eventually.equal(0);
+    });*/
     it('Should allow pausing before looping', function(done) {
         this.timeout(8000); 
-        driver.executeScript("return videos[1].abLoopPlugin.setOptions({'pauseBeforeLooping':true,'start':5,'end':7,'enabled':true}).goToStart().getOptions();").then(function(opts){
+        driver.executeScript("return videos[1].abLoopPlugin.setOptions({'pauseBeforeLooping':true,'start':5,'end':7,'enabled':true}).goToStart().getOptions();")
+            .then(function(opts){
+                console.log(opts);
+                expect(opts.start).to.equal(5);
+                expect(opts.end).to.equal(7);
+                expect(opts.enabled).to.equal(true);
+                setTimeout(function(){ 
+                    driver.executeScript("videos[1].play();return videos[1].paused();")
+                        .then(function(paused){
+                            expect(paused).to.equal(false);
+                            setTimeout(function(){ 
+                                driver.executeScript("return {currentTime:videos[1].currentTime(),paused:videos[1].paused(),opts:videos[1].abLoopPlugin.getOptions()};")
+                                    .then(function(data){
+                                        expect(data.paused).to.equal(true);
+                                        expect(data.currentTime).to.be.at.least(7);
+                                        expect(data.currentTime).to.be.below(7.5);
+                                        done();
+                                    })
+                                    .catch(errorHandler)
+                                ;
+                            }, 3000);
+                        })
+                        .catch(errorHandler)
+                    ;
+                }, 2000);
+            }).catch(errorHandler)
+        ;
+    }); 
+    /*
+    it('Should play the first video', (done) => {
+        this.timeout(8000); 
+        driver.executeScript(
+            `return {
+                play: videos[0].abLoopPlugin.player.play(),
+                opts: videos[0].abLoopPlugin.getOptions()
+            };`
+        )
+        .then(function({play,opts}){
+            console.log(opts);
             expect(opts.start).to.equal(5);
             expect(opts.end).to.equal(7);
             expect(opts.enabled).to.equal(true);
             setTimeout(function(){ 
-                driver.executeScript("videos[1].play();return videos[1].paused();").then(function(paused){
-                    expect(paused).to.equal(false);
-                    setTimeout(function(){ 
-                        driver.executeScript("return {currentTime:videos[1].currentTime(),paused:videos[1].paused(),opts:videos[1].abLoopPlugin.getOptions()};").then(function(data){
-                            expect(data.paused).to.equal(true);
-                            expect(data.currentTime).to.be.at.least(7);
-                            expect(data.currentTime).to.be.below(7.5);
-                            done();
-                        })
-                    }, 3000);
-                })
+                driver.executeScript("videos[1].play();return videos[1].paused();")
+                    .then(function(paused){
+                        expect(paused).to.equal(false);
+                        setTimeout(function(){ 
+                            driver.executeScript("return {currentTime:videos[1].currentTime(),paused:videos[1].paused(),opts:videos[1].abLoopPlugin.getOptions()};")
+                                .then(function(data){
+                                    expect(data.paused).to.equal(true);
+                                    expect(data.currentTime).to.be.at.least(7);
+                                    expect(data.currentTime).to.be.below(7.5);
+                                    done();
+                                })
+                                .catch(errorHandler)
+                            ;
+                        }, 3000);
+                    })
+                    .catch(errorHandler)
+                ;
             }, 2000);
-        });
+        }).catch(errorHandler)
+        ;
     }); 
-    
+    //*/
 });
diff --git a/videojs-abloop.js b/videojs-abloop.js
index 1ae455d..a3e3440 100644
--- a/videojs-abloop.js
+++ b/videojs-abloop.js
@@ -16,7 +16,7 @@
 })(window, function (window, videojs) {
 	"use strict";
 
-	var version = "1.0.1";
+	var version = "1.0.2";
 	var abLoopPlugin = function (initialOptions) {
 
 		//default initial options if not specified. 
@@ -108,7 +108,7 @@
 					} //allow false values to mean loop til end
 					if (isNumber(x)) {
 						var duration = player.duration();
-						if (duration === undefined || duration === 0) { //duration unknown
+						if (duration === 0 || !(isNumber(duration))) { //duration unknown
 							if (x >= 0) {
 								return x;
 							}
@@ -117,6 +117,8 @@
 								return x;
 							} else if (x > duration) {
 								return duration;
+							} else {    // shouldn't happen....
+								return x;
 							}
 						}
 					}