diff --git a/.travis.yml b/.travis.yml
index 910e5dd..9bb31d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
+  - "5.2.0"
 
 before_script:
   - npm install -g grunt-cli
diff --git a/README.md b/README.md
index dcbb953..6757960 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ Ng-Idle
 
 [![Join the chat at https://gitter.im/HackedByChinese/ng-idle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/HackedByChinese/ng-idle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/HackedByChinese/ng-idle.png?branch=master)](https://travis-ci.org/HackedByChinese/ng-idle)
 
+**Angular 2 Developers**: This module is for Angular 1 only. Check out [ng2-idle](https://github.com/HackedByChinese/ng2-idle) for the Angular 2 version.
+
 ## About
  You may wish to detect idle users and respond, for example, to log them out so their sensitive data is protected, or taunt them, or whatever. I don't care.
 
diff --git a/angular-idle.js b/angular-idle.js
index fbbfc50..42a9c18 100644
--- a/angular-idle.js
+++ b/angular-idle.js
@@ -1,6 +1,6 @@
 /*** Directives and services for responding to idle users in AngularJS
 * @author Mike Grabski <me@mikegrabski.com>
-* @version v1.1.1
+* @version v1.2.0
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
@@ -85,6 +85,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
       timeout: 30, // in seconds (default is 30sec)
       autoResume: 'idle', // lets events automatically resume (unsets idle state/resets warning)
       interrupt: 'mousemove keydown DOMMouseScroll mousewheel mousedown touchstart touchmove scroll',
+      windowInterrupt: null,
       keepalive: true
     };
 
@@ -102,6 +103,10 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
       options.interrupt = events;
     };
 
+    this.windowInterrupt = function(events) {
+      options.windowInterrupt = events;
+    };
+
     var setIdle = this.idle = function(seconds) {
       if (seconds <= 0) throw new Error('Idle must be a value in seconds, greater than 0.');
 
@@ -148,8 +153,6 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           state.idling = !state.idling;
           var name = state.idling ? 'Start' : 'End';
 
-          $rootScope.$broadcast('Idle' + name);
-
           if (state.idling) {
             stopKeepalive();
             if (options.timeout) {
@@ -161,10 +164,19 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             startKeepalive();
           }
 
+          $rootScope.$broadcast('Idle' + name);
+
           $interval.cancel(state.idle);
         }
 
         function countdown() {
+
+          // check not called when no longer idling
+          // possible with multiple tabs
+          if(!state.idling){
+            return;
+          }
+
           // countdown has expired, so signal timeout
           if (state.countdown <= 0) {
             timeout();
@@ -262,7 +274,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
 
             stopKeepalive();
           },
-          interrupt: function(noExpiryUpdate) {
+          interrupt: function(anotherTab) {
             if (!state.running) return;
 
             if (options.timeout && this.isExpired()) {
@@ -271,7 +283,24 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             }
 
             // note: you can no longer auto resume once we exceed the expiry; you will reset state by calling watch() manually
-            if (options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(noExpiryUpdate);
+            if (anotherTab || options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(anotherTab);
+          }
+        };
+
+        var lastMove = {
+          clientX: null,
+          clientY: null,
+          swap: function(event) {
+            var last = {clientX: this.clientX, clientY: this.clientY};
+            this.clientX = event.clientX;
+            this.clientY = event.clientY;
+            return last;
+          },
+          hasMoved: function(event) {
+            var last = this.swap(event);
+            if (this.clientX === null || event.movementX || event.movementY) return true;
+            else if (last.clientX != event.clientX || last.clientY != event.clientY) return true;
+            else return false;
           }
         };
 
@@ -280,21 +309,23 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             return; // Fix for Chrome desktop notifications, triggering mousemove event.
           }
 
-          /*
-            note:
-              webkit fires fake mousemove events when the user has done nothing, so the idle will never time out while the cursor is over the webpage
-              Original webkit bug report which caused this issue:
-                https://bugs.webkit.org/show_bug.cgi?id=17052
-              Chromium bug reports for issue:
-                https://code.google.com/p/chromium/issues/detail?id=5598
-                https://code.google.com/p/chromium/issues/detail?id=241476
-                https://code.google.com/p/chromium/issues/detail?id=317007
-          */
-          if (event.type !== 'mousemove' || angular.isUndefined(event.movementX) || (event.movementX || event.movementY)) {
+          if (event.type !== 'mousemove' || lastMove.hasMoved(event)) {
             svc.interrupt();
           }
         });
 
+        if(options.windowInterrupt) {
+          var eventList = options.windowInterrupt.split(' ');
+          var fn = function() {
+            svc.interrupt();
+          };
+
+          for(var i=0; i<eventList.length; i++) {
+            if ($window.addEventListener) $window.addEventListener(eventList[i], fn, false);
+            else $window.attachEvent(eventList[i], fn)
+          }
+        }
+
         var wrap = function(event) {
           if (event.key === 'ngIdle.expiry' && event.newValue && event.newValue !== event.oldValue) {
             var val = angular.fromJson(event.newValue);
diff --git a/angular-idle.map b/angular-idle.map
index f2a9b8d..0b48f01 100644
--- a/angular-idle.map
+++ b/angular-idle.map
@@ -1 +1 @@
-{"version":3,"file":"angular-idle.min.js","sources":["angular-idle.js"],"names":["window","angular","undefined","module","provider","options","http","interval","this","value","Error","isString","url","method","cache","setInterval","seconds","parseInt","isNaN","$get","$rootScope","$log","$interval","$http","handleResponse","data","status","$broadcast","ping","isObject","success","error","state","_options","start","cancel","stop","idle","timeout","autoResume","interrupt","keepalive","setTimeout","isNumber","events","setIdle","enabled","$document","Keepalive","LocalStorage","$window","startKeepalive","running","stopKeepalive","toggleState","idling","name","countdown","changeOption","self","fn","reset","unwatch","watch","getExpiry","obj","get","time","Date","setExpiry","date","set","id","remove","getTime","svc","_getNow","getIdle","getTimeout","isExpired","expiry","noExpiryUpdate","find","on","event","type","originalEvent","movementX","movementY","isUndefined","wrap","key","newValue","oldValue","val","fromJson","addEventListener","attachEvent","directive","Idle","restrict","scope","link","$scope","$on","e","$evalAsync","padLeft","nr","n","str","Array","String","length","join","setEnabled","$interpolate","original","timedout","isEnabled","store","overwrite","title","idleMessage","timedOutMessage","setAsIdle","remaining","totalSeconds","minutes","Math","floor","setAsTimedOut","restore","Title","$element","$attr","idleDisabled","innerText","service","localStorage","IdleStorageAccessor","AlternativeStorage","storageMap","setItem","getItem","removeItem","getStorage","s","err","storage","toJson","_wrapped"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"angular-idle.min.js","sources":["angular-idle.js"],"names":["window","angular","undefined","module","provider","options","http","interval","this","value","Error","isString","url","method","cache","setInterval","seconds","parseInt","isNaN","$get","$rootScope","$log","$interval","$http","handleResponse","data","status","$broadcast","ping","isObject","success","error","state","_options","start","cancel","stop","idle","timeout","autoResume","interrupt","windowInterrupt","keepalive","setTimeout","isNumber","events","setIdle","enabled","$document","Keepalive","LocalStorage","$window","startKeepalive","running","stopKeepalive","toggleState","idling","name","countdown","changeOption","self","fn","reset","unwatch","watch","getExpiry","obj","get","time","Date","setExpiry","date","set","id","remove","getTime","svc","_getNow","getIdle","getTimeout","isExpired","expiry","noExpiryUpdate","anotherTab","lastMove","clientX","clientY","swap","event","last","hasMoved","movementX","movementY","find","on","type","originalEvent","eventList","split","i","length","addEventListener","attachEvent","wrap","key","newValue","oldValue","val","fromJson","directive","Idle","restrict","scope","link","$scope","$on","e","$evalAsync","padLeft","nr","n","str","Array","String","join","setEnabled","$interpolate","original","timedout","isEnabled","isUndefined","store","overwrite","title","idleMessage","timedOutMessage","setAsIdle","remaining","totalSeconds","minutes","Math","floor","setAsTimedOut","restore","Title","$element","$attr","idleDisabled","innerText","service","localStorage","IdleStorageAccessor","AlternativeStorage","storageMap","setItem","getItem","removeItem","getStorage","s","err","storage","toJson","_wrapped"],"mappings":"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"}
\ No newline at end of file
diff --git a/angular-idle.min.js b/angular-idle.min.js
index f1f10e2..0c50021 100644
--- a/angular-idle.min.js
+++ b/angular-idle.min.js
@@ -1,9 +1,9 @@
 /*** Directives and services for responding to idle users in AngularJS
 * @author Mike Grabski <me@mikegrabski.com>
-* @version v1.1.1
+* @version v1.2.0
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
 
-!function(a,b,c){"use strict";b.module("ngIdle",["ngIdle.keepalive","ngIdle.idle","ngIdle.countdown","ngIdle.title","ngIdle.localStorage"]),b.module("ngIdle.keepalive",[]).provider("Keepalive",function(){var a={http:null,interval:600};this.http=function(c){if(!c)throw new Error("Argument must be a string containing a URL, or an object containing the HTTP request configuration.");b.isString(c)&&(c={url:c,method:"GET"}),c.cache=!1,a.http=c};var c=this.interval=function(b){if(b=parseInt(b),isNaN(b)||0>=b)throw new Error("Interval must be expressed in seconds and be greater than 0.");a.interval=b};this.$get=["$rootScope","$log","$interval","$http",function(d,e,f,g){function h(a,b){d.$broadcast("KeepaliveResponse",a,b)}function i(){d.$broadcast("Keepalive"),b.isObject(a.http)&&g(a.http).success(h).error(h)}var j={ping:null};return{_options:function(){return a},setInterval:c,start:function(){return f.cancel(j.ping),j.ping=f(i,1e3*a.interval),j.ping},stop:function(){f.cancel(j.ping)},ping:function(){i()}}}]}),b.module("ngIdle.idle",["ngIdle.keepalive","ngIdle.localStorage"]).provider("Idle",function(){var a={idle:1200,timeout:30,autoResume:"idle",interrupt:"mousemove keydown DOMMouseScroll mousewheel mousedown touchstart touchmove scroll",keepalive:!0},c=this.timeout=function(c){if(c===!1)a.timeout=0;else{if(!(b.isNumber(c)&&c>=0))throw new Error("Timeout must be zero or false to disable the feature, or a positive integer (in seconds) to enable it.");a.timeout=c}};this.interrupt=function(b){a.interrupt=b};var d=this.idle=function(b){if(0>=b)throw new Error("Idle must be a value in seconds, greater than 0.");a.idle=b};this.autoResume=function(b){b===!0?a.autoResume="idle":b===!1?a.autoResume="off":a.autoResume=b},this.keepalive=function(b){a.keepalive=b===!0},this.$get=["$interval","$log","$rootScope","$document","Keepalive","IdleLocalStorage","$window",function(e,f,g,h,i,j,k){function l(){a.keepalive&&(t.running&&i.ping(),i.start())}function m(){a.keepalive&&i.stop()}function n(){t.idling=!t.idling;var b=t.idling?"Start":"End";g.$broadcast("Idle"+b),t.idling?(m(),a.timeout&&(t.countdown=a.timeout,o(),t.timeout=e(o,1e3,a.timeout,!1))):l(),e.cancel(t.idle)}function o(){return t.countdown<=0?void p():(g.$broadcast("IdleWarn",t.countdown),void t.countdown--)}function p(){m(),e.cancel(t.idle),e.cancel(t.timeout),t.idling=!0,t.running=!1,t.countdown=0,g.$broadcast("IdleTimeout")}function q(a,b,c){var d=a.running();a.unwatch(),b(c),d&&a.watch()}function r(){var a=j.get("expiry");return a&&a.time?new Date(a.time):null}function s(a){a?j.set("expiry",{id:u,time:a}):j.remove("expiry")}var t={idle:null,timeout:null,idling:!1,running:!1,countdown:null},u=(new Date).getTime(),v={_options:function(){return a},_getNow:function(){return new Date},getIdle:function(){return a.idle},getTimeout:function(){return a.timeout},setIdle:function(a){q(this,d,a)},setTimeout:function(a){q(this,c,a)},isExpired:function(){var a=r();return null!==a&&a<=this._getNow()},running:function(){return t.running},idling:function(){return t.idling},watch:function(b){e.cancel(t.idle),e.cancel(t.timeout);var c=a.timeout?a.timeout:0;b||s(new Date((new Date).getTime()+1e3*(a.idle+c))),t.idling?n():t.running||l(),t.running=!0,t.idle=e(n,1e3*a.idle,0,!1)},unwatch:function(){e.cancel(t.idle),e.cancel(t.timeout),t.idling=!1,t.running=!1,s(null),m()},interrupt:function(b){return t.running?a.timeout&&this.isExpired()?void p():void(("idle"===a.autoResume||"notIdle"===a.autoResume&&!t.idling)&&this.watch(b)):void 0}};h.find("html").on(a.interrupt,function(a){"mousemove"===a.type&&a.originalEvent&&0===a.originalEvent.movementX&&0===a.originalEvent.movementY||("mousemove"!==a.type||b.isUndefined(a.movementX)||a.movementX||a.movementY)&&v.interrupt()});var w=function(a){if("ngIdle.expiry"===a.key&&a.newValue&&a.newValue!==a.oldValue){var c=b.fromJson(a.newValue);if(c.id===u)return;v.interrupt(!0)}};return k.addEventListener?k.addEventListener("storage",w,!1):k.attachEvent("onstorage",w),v}]}),b.module("ngIdle.countdown",["ngIdle.idle"]).directive("idleCountdown",["Idle",function(a){return{restrict:"A",scope:{value:"=idleCountdown"},link:function(b){b.value=a.getTimeout(),b.$on("IdleWarn",function(a,c){b.$evalAsync(function(){b.value=c})}),b.$on("IdleTimeout",function(){b.$evalAsync(function(){b.value=0})})}}}]),b.module("ngIdle.title",[]).provider("Title",function(){function a(a,b,c){return new Array(b-String(a).length+1).join(c||"0")+a}var c={enabled:!0},d=this.enabled=function(a){c.enabled=a===!0};this.$get=["$document","$interpolate",function(e,f){var g={original:null,idle:"{{minutes}}:{{seconds}} until your session times out!",timedout:"Your session has expired."};return{setEnabled:d,isEnabled:function(){return c.enabled},original:function(a){return b.isUndefined(a)?g.original:void(g.original=a)},store:function(a){(a||!g.original)&&(g.original=this.value())},value:function(a){return b.isUndefined(a)?e[0].title:void(e[0].title=a)},idleMessage:function(a){return b.isUndefined(a)?g.idle:void(g.idle=a)},timedOutMessage:function(a){return b.isUndefined(a)?g.timedout:void(g.timedout=a)},setAsIdle:function(b){this.store();var c={totalSeconds:b};c.minutes=Math.floor(b/60),c.seconds=a(b-60*c.minutes,2),this.value(f(this.idleMessage())(c))},setAsTimedOut:function(){this.store(),this.value(this.timedOutMessage())},restore:function(){this.original()&&this.value(this.original())}}}]}).directive("title",["Title",function(a){return{restrict:"E",link:function(b,c,d){a.isEnabled()&&!d.idleDisabled&&(a.store(!0),b.$on("IdleStart",function(){a.original(c[0].innerText)}),b.$on("IdleWarn",function(b,c){a.setAsIdle(c)}),b.$on("IdleEnd",function(){a.restore()}),b.$on("IdleTimeout",function(){a.setAsTimedOut()}))}}}]),b.module("ngIdle.localStorage",[]).service("IdleStorageAccessor",["$window",function(a){return{get:function(){return a.localStorage}}}]).service("IdleLocalStorage",["IdleStorageAccessor",function(a){function d(){var a={};this.setItem=function(b,c){a[b]=c},this.getItem=function(b){return"undefined"!=typeof a[b]?a[b]:null},this.removeItem=function(b){a[b]=c}}function e(){try{var b=a.get();return b.setItem("ngIdleStorage",""),b.removeItem("ngIdleStorage"),b}catch(c){return new d}}var f=e();return{set:function(a,c){f.setItem("ngIdle."+a,b.toJson(c))},get:function(a){return b.fromJson(f.getItem("ngIdle."+a))},remove:function(a){f.removeItem("ngIdle."+a)},_wrapped:function(){return f}}}])}(window,window.angular);
+!function(a,b,c){"use strict";b.module("ngIdle",["ngIdle.keepalive","ngIdle.idle","ngIdle.countdown","ngIdle.title","ngIdle.localStorage"]),b.module("ngIdle.keepalive",[]).provider("Keepalive",function(){var a={http:null,interval:600};this.http=function(c){if(!c)throw new Error("Argument must be a string containing a URL, or an object containing the HTTP request configuration.");b.isString(c)&&(c={url:c,method:"GET"}),c.cache=!1,a.http=c};var c=this.interval=function(b){if(b=parseInt(b),isNaN(b)||0>=b)throw new Error("Interval must be expressed in seconds and be greater than 0.");a.interval=b};this.$get=["$rootScope","$log","$interval","$http",function(d,e,f,g){function h(a,b){d.$broadcast("KeepaliveResponse",a,b)}function i(){d.$broadcast("Keepalive"),b.isObject(a.http)&&g(a.http).success(h).error(h)}var j={ping:null};return{_options:function(){return a},setInterval:c,start:function(){return f.cancel(j.ping),j.ping=f(i,1e3*a.interval),j.ping},stop:function(){f.cancel(j.ping)},ping:function(){i()}}}]}),b.module("ngIdle.idle",["ngIdle.keepalive","ngIdle.localStorage"]).provider("Idle",function(){var a={idle:1200,timeout:30,autoResume:"idle",interrupt:"mousemove keydown DOMMouseScroll mousewheel mousedown touchstart touchmove scroll",windowInterrupt:null,keepalive:!0},c=this.timeout=function(c){if(c===!1)a.timeout=0;else{if(!(b.isNumber(c)&&c>=0))throw new Error("Timeout must be zero or false to disable the feature, or a positive integer (in seconds) to enable it.");a.timeout=c}};this.interrupt=function(b){a.interrupt=b},this.windowInterrupt=function(b){a.windowInterrupt=b};var d=this.idle=function(b){if(0>=b)throw new Error("Idle must be a value in seconds, greater than 0.");a.idle=b};this.autoResume=function(b){b===!0?a.autoResume="idle":b===!1?a.autoResume="off":a.autoResume=b},this.keepalive=function(b){a.keepalive=b===!0},this.$get=["$interval","$log","$rootScope","$document","Keepalive","IdleLocalStorage","$window",function(e,f,g,h,i,j,k){function l(){a.keepalive&&(t.running&&i.ping(),i.start())}function m(){a.keepalive&&i.stop()}function n(){t.idling=!t.idling;var b=t.idling?"Start":"End";t.idling?(m(),a.timeout&&(t.countdown=a.timeout,o(),t.timeout=e(o,1e3,a.timeout,!1))):l(),g.$broadcast("Idle"+b),e.cancel(t.idle)}function o(){if(t.idling){if(t.countdown<=0)return void p();g.$broadcast("IdleWarn",t.countdown),t.countdown--}}function p(){m(),e.cancel(t.idle),e.cancel(t.timeout),t.idling=!0,t.running=!1,t.countdown=0,g.$broadcast("IdleTimeout")}function q(a,b,c){var d=a.running();a.unwatch(),b(c),d&&a.watch()}function r(){var a=j.get("expiry");return a&&a.time?new Date(a.time):null}function s(a){a?j.set("expiry",{id:u,time:a}):j.remove("expiry")}var t={idle:null,timeout:null,idling:!1,running:!1,countdown:null},u=(new Date).getTime(),v={_options:function(){return a},_getNow:function(){return new Date},getIdle:function(){return a.idle},getTimeout:function(){return a.timeout},setIdle:function(a){q(this,d,a)},setTimeout:function(a){q(this,c,a)},isExpired:function(){var a=r();return null!==a&&a<=this._getNow()},running:function(){return t.running},idling:function(){return t.idling},watch:function(b){e.cancel(t.idle),e.cancel(t.timeout);var c=a.timeout?a.timeout:0;b||s(new Date((new Date).getTime()+1e3*(a.idle+c))),t.idling?n():t.running||l(),t.running=!0,t.idle=e(n,1e3*a.idle,0,!1)},unwatch:function(){e.cancel(t.idle),e.cancel(t.timeout),t.idling=!1,t.running=!1,s(null),m()},interrupt:function(b){return t.running?a.timeout&&this.isExpired()?void p():void((b||"idle"===a.autoResume||"notIdle"===a.autoResume&&!t.idling)&&this.watch(b)):void 0}},w={clientX:null,clientY:null,swap:function(a){var b={clientX:this.clientX,clientY:this.clientY};return this.clientX=a.clientX,this.clientY=a.clientY,b},hasMoved:function(a){var b=this.swap(a);return null===this.clientX||a.movementX||a.movementY?!0:b.clientX!=a.clientX||b.clientY!=a.clientY?!0:!1}};if(h.find("html").on(a.interrupt,function(a){"mousemove"===a.type&&a.originalEvent&&0===a.originalEvent.movementX&&0===a.originalEvent.movementY||("mousemove"!==a.type||w.hasMoved(a))&&v.interrupt()}),a.windowInterrupt)for(var x=a.windowInterrupt.split(" "),y=function(){v.interrupt()},z=0;z<x.length;z++)k.addEventListener?k.addEventListener(x[z],y,!1):k.attachEvent(x[z],y);var A=function(a){if("ngIdle.expiry"===a.key&&a.newValue&&a.newValue!==a.oldValue){var c=b.fromJson(a.newValue);if(c.id===u)return;v.interrupt(!0)}};return k.addEventListener?k.addEventListener("storage",A,!1):k.attachEvent("onstorage",A),v}]}),b.module("ngIdle.countdown",["ngIdle.idle"]).directive("idleCountdown",["Idle",function(a){return{restrict:"A",scope:{value:"=idleCountdown"},link:function(b){b.value=a.getTimeout(),b.$on("IdleWarn",function(a,c){b.$evalAsync(function(){b.value=c})}),b.$on("IdleTimeout",function(){b.$evalAsync(function(){b.value=0})})}}}]),b.module("ngIdle.title",[]).provider("Title",function(){function a(a,b,c){return new Array(b-String(a).length+1).join(c||"0")+a}var c={enabled:!0},d=this.enabled=function(a){c.enabled=a===!0};this.$get=["$document","$interpolate",function(e,f){var g={original:null,idle:"{{minutes}}:{{seconds}} until your session times out!",timedout:"Your session has expired."};return{setEnabled:d,isEnabled:function(){return c.enabled},original:function(a){return b.isUndefined(a)?g.original:void(g.original=a)},store:function(a){(a||!g.original)&&(g.original=this.value())},value:function(a){return b.isUndefined(a)?e[0].title:void(e[0].title=a)},idleMessage:function(a){return b.isUndefined(a)?g.idle:void(g.idle=a)},timedOutMessage:function(a){return b.isUndefined(a)?g.timedout:void(g.timedout=a)},setAsIdle:function(b){this.store();var c={totalSeconds:b};c.minutes=Math.floor(b/60),c.seconds=a(b-60*c.minutes,2),this.value(f(this.idleMessage())(c))},setAsTimedOut:function(){this.store(),this.value(this.timedOutMessage())},restore:function(){this.original()&&this.value(this.original())}}}]}).directive("title",["Title",function(a){return{restrict:"E",link:function(b,c,d){a.isEnabled()&&!d.idleDisabled&&(a.store(!0),b.$on("IdleStart",function(){a.original(c[0].innerText)}),b.$on("IdleWarn",function(b,c){a.setAsIdle(c)}),b.$on("IdleEnd",function(){a.restore()}),b.$on("IdleTimeout",function(){a.setAsTimedOut()}))}}}]),b.module("ngIdle.localStorage",[]).service("IdleStorageAccessor",["$window",function(a){return{get:function(){return a.localStorage}}}]).service("IdleLocalStorage",["IdleStorageAccessor",function(a){function d(){var a={};this.setItem=function(b,c){a[b]=c},this.getItem=function(b){return"undefined"!=typeof a[b]?a[b]:null},this.removeItem=function(b){a[b]=c}}function e(){try{var b=a.get();return b.setItem("ngIdleStorage",""),b.removeItem("ngIdleStorage"),b}catch(c){return new d}}var f=e();return{set:function(a,c){f.setItem("ngIdle."+a,b.toJson(c))},get:function(a){return b.fromJson(f.getItem("ngIdle."+a))},remove:function(a){f.removeItem("ngIdle."+a)},_wrapped:function(){return f}}}])}(window,window.angular);
 //# sourceMappingURL=angular-idle.map
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 95c3c31..3d90277 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "homepage": "https://github.com/HackedByChinese/ng-idle",
   "description": "Responding to idle users in AngularJS",
   "main": "angular-idle.js",
diff --git a/karma.conf.js b/karma.conf.js
index 44cab70..cb9cc2c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -14,6 +14,7 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
+      './node_modules/phantomjs-polyfill/bind-polyfill.js',
       '+(bower_components|node_modules)/jquery/?(dist)/jquery.js',
       '+(bower_components|node_modules)/angular/angular.js',
       '+(bower_components|node_modules)/angular-mocks/angular-mocks.js',
diff --git a/package.json b/package.json
index fb6624f..25f3e08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Directives and services for responding to idle users in AngularJS",
   "keywords": [
     "angularjs",
@@ -50,6 +50,7 @@
     "karma-script-launcher": "~0.1.0",
     "matchdep": "~0.3.0",
     "phantomjs": "^1.9.17",
+    "phantomjs-polyfill": "0.0.2",
     "requirejs": "~2.1.10"
   }
 }
diff --git a/sample/index.html b/sample/index.html
index 670c299..0c894a9 100644
--- a/sample/index.html
+++ b/sample/index.html
@@ -51,6 +51,7 @@
       })
       .config(function(IdleProvider, KeepaliveProvider) {
         KeepaliveProvider.interval(10);
+        IdleProvider.windowInterrupt('focus');
       })
       .run(function($rootScope, Idle, $log, Keepalive){
         Idle.watch();
diff --git a/src/idle/idle.js b/src/idle/idle.js
index b08a082..6f13d29 100644
--- a/src/idle/idle.js
+++ b/src/idle/idle.js
@@ -5,6 +5,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
       timeout: 30, // in seconds (default is 30sec)
       autoResume: 'idle', // lets events automatically resume (unsets idle state/resets warning)
       interrupt: 'mousemove keydown DOMMouseScroll mousewheel mousedown touchstart touchmove scroll',
+      windowInterrupt: null,
       keepalive: true
     };
 
@@ -22,6 +23,10 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
       options.interrupt = events;
     };
 
+    this.windowInterrupt = function(events) {
+      options.windowInterrupt = events;
+    };
+
     var setIdle = this.idle = function(seconds) {
       if (seconds <= 0) throw new Error('Idle must be a value in seconds, greater than 0.');
 
@@ -68,8 +73,6 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           state.idling = !state.idling;
           var name = state.idling ? 'Start' : 'End';
 
-          $rootScope.$broadcast('Idle' + name);
-
           if (state.idling) {
             stopKeepalive();
             if (options.timeout) {
@@ -81,10 +84,19 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             startKeepalive();
           }
 
+          $rootScope.$broadcast('Idle' + name);
+
           $interval.cancel(state.idle);
         }
 
         function countdown() {
+
+          // check not called when no longer idling
+          // possible with multiple tabs
+          if(!state.idling){
+            return;
+          }
+
           // countdown has expired, so signal timeout
           if (state.countdown <= 0) {
             timeout();
@@ -182,7 +194,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
 
             stopKeepalive();
           },
-          interrupt: function(noExpiryUpdate) {
+          interrupt: function(anotherTab) {
             if (!state.running) return;
 
             if (options.timeout && this.isExpired()) {
@@ -191,7 +203,24 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             }
 
             // note: you can no longer auto resume once we exceed the expiry; you will reset state by calling watch() manually
-            if (options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(noExpiryUpdate);
+            if (anotherTab || options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(anotherTab);
+          }
+        };
+
+        var lastMove = {
+          clientX: null,
+          clientY: null,
+          swap: function(event) {
+            var last = {clientX: this.clientX, clientY: this.clientY};
+            this.clientX = event.clientX;
+            this.clientY = event.clientY;
+            return last;
+          },
+          hasMoved: function(event) {
+            var last = this.swap(event);
+            if (this.clientX === null || event.movementX || event.movementY) return true;
+            else if (last.clientX != event.clientX || last.clientY != event.clientY) return true;
+            else return false;
           }
         };
 
@@ -200,21 +229,23 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             return; // Fix for Chrome desktop notifications, triggering mousemove event.
           }
 
-          /*
-            note:
-              webkit fires fake mousemove events when the user has done nothing, so the idle will never time out while the cursor is over the webpage
-              Original webkit bug report which caused this issue:
-                https://bugs.webkit.org/show_bug.cgi?id=17052
-              Chromium bug reports for issue:
-                https://code.google.com/p/chromium/issues/detail?id=5598
-                https://code.google.com/p/chromium/issues/detail?id=241476
-                https://code.google.com/p/chromium/issues/detail?id=317007
-          */
-          if (event.type !== 'mousemove' || angular.isUndefined(event.movementX) || (event.movementX || event.movementY)) {
+          if (event.type !== 'mousemove' || lastMove.hasMoved(event)) {
             svc.interrupt();
           }
         });
 
+        if(options.windowInterrupt) {
+          var eventList = options.windowInterrupt.split(' ');
+          var fn = function() {
+            svc.interrupt();
+          };
+
+          for(var i=0; i<eventList.length; i++) {
+            if ($window.addEventListener) $window.addEventListener(eventList[i], fn, false);
+            else $window.attachEvent(eventList[i], fn)
+          }
+        }
+
         var wrap = function(event) {
           if (event.key === 'ngIdle.expiry' && event.newValue && event.newValue !== event.oldValue) {
             var val = angular.fromJson(event.newValue);
diff --git a/src/idle/idle.spec.js b/src/idle/idle.spec.js
index 2de0ae2..518488e 100644
--- a/src/idle/idle.spec.js
+++ b/src/idle/idle.spec.js
@@ -61,6 +61,14 @@ describe('ngIdle', function() {
         expect(create()._options().interrupt).toBe('click');
       });
 
+      it('windowInterrupt() should update defaults', function() {
+        expect(IdleProvider).not.toBeUndefined();
+
+        IdleProvider.windowInterrupt('focus');
+
+        expect(create()._options().windowInterrupt).toBe('focus');
+      });
+
       it('idle() should update defaults', function() {
         expect(IdleProvider).not.toBeUndefined();
 
@@ -400,6 +408,16 @@ describe('ngIdle', function() {
 
       //   expect(Idle.idling()).toBe(false);
       // });
+
+
+      //HACK: this has the same issues as the test above
+      //it('window event should interrupt idle timeout', function() {
+      //  IdleProvider.windowInterrupt('focus');
+      //  Idle = create();
+      //
+      //  Idle.watch();
+      //
+      //});
     });
 
     describe('Idle with different autoResume values', function() {
@@ -461,6 +479,23 @@ describe('ngIdle', function() {
         Idle.interrupt();
         expect(Idle.watch).not.toHaveBeenCalled();
       });
+
+      it ('interrupt(true) should call watch() if idle and autoResume is notIdle', function() {
+        IdleProvider.autoResume('notIdle');
+        Idle = create();
+
+        spyOn(Idle, 'watch').andCallThrough();
+
+        // arrange
+        Idle.watch(); // start watching
+        Idle.watch.reset(); // reset watch spy to ignore the prior setup call
+
+        $interval.flush(DEFAULTIDLEDURATION);
+
+        Idle.interrupt(true);
+        expect(Idle.watch).toHaveBeenCalled();
+      });
+
     });
 
     describe('Idle with timeout disabled', function() {