diff --git a/angular-scroll.js b/angular-scroll.js
index b293411..2c7e7ca 100644
--- a/angular-scroll.js
+++ b/angular-scroll.js
@@ -1,4 +1,4 @@
-angular.module('duScroll', ['duScroll.scroller', 'duScroll.scrollPosition', 'duScroll.requestAnimation', 'duScroll.smoothScroll']);
+angular.module('duScroll', ['duScroll.scroller', 'duScroll.scrollPosition', 'duScroll.scrollspy', 'duScroll.requestAnimation', 'duScroll.smoothScroll']);
 
 
 angular.module('duScroll.requestAnimation', []).
@@ -60,11 +60,13 @@ factory('scroller',
         x: $window.scrollX
       };
       var delta = {
-        y: y - start.y,
-        x: x - start.x
+        y: Math.round(y - start.y),
+        x: Math.round(x - start.x)
       };
+      if(!delta.x && !delta.y) return;
+
       var frame = 0;
-      var frames = duration/60;
+      var frames = Math.ceil(duration/60);
       var animate = function() {
         frame++;
         var percent = (frame === frames ? 1 : easeout(frame/frames));
@@ -91,25 +93,75 @@ factory('scroller',
 );
 
 angular.module('duScroll.smoothScroll', ['duScroll.scroller']).
-directive('smoothScroll', function(scroller){
+directive('duSmoothScroll', function(scroller){
 
   return {
     link : function($scope, $element, $attr){
       var element = angular.element($element[0]);
       element.on('click', function(e){
-        if(!$attr.href || $attr.href.indexOf('#') !== 0) return;
-        var elem = document.getElementById($attr.href.substring(1));
+        if(!$attr.href || $attr.href.indexOf('#') === -1) return;
+        var elem = document.getElementById($attr.href.replace(/.*(?=#[^\s]+$)/, '').substring(1));
         if(!elem) return;
         
         if (e.stopPropagation) e.stopPropagation();
         if (e.preventDefault) e.preventDefault();
 
-
+        var offset = -($attr.offset ? parseInt($attr.offset, 10) : 0);
         var pos = elem.getBoundingClientRect();
 
         var delta = pos.top;
-        scroller.scrollDelta(0, pos.top, 1000);
+        scroller.scrollDelta(0, pos.top + (isNaN(offset) ? 0 : offset), 1000);
       });
     }
   };
+});
+
+angular.module('duScroll.scrollspy', ['duScroll.scrollPosition']).
+directive('duScrollspy', function(scrollPosition) {
+  var spies = [];
+  var currentlyActive;
+
+  function gotScroll(scrollY) {
+    var toBeActive;
+    for(var spy, scroll, pos, i = 0; i < spies.length; i++) {
+      spy = spies[i];
+      pos = spy.target.getBoundingClientRect();
+      if(pos.top + spy.offset < 20 && pos.top*-1 < pos.height) {
+        if(!toBeActive || toBeActive.top < pos.top) {
+          toBeActive = {
+            top: pos.top,
+            spy: spy
+          };
+        }
+      }
+    }
+    if(toBeActive) {
+      toBeActive = toBeActive.spy;
+    }
+    if(currentlyActive === toBeActive) return;
+    if(currentlyActive) currentlyActive.$element.removeClass('active');
+    if(toBeActive) toBeActive.$element.addClass('active');
+    currentlyActive = toBeActive;
+  }
+
+  function addSpy(target, $element, offset) {
+    if(!spies.length) {
+      scrollPosition.observe(gotScroll);
+    }
+    spies.push({
+      target:   target, 
+      $element: $element, 
+      element:  angular.element($element[0]),
+      offset:   offset
+    });
+  }
+
+  return {
+    link: function ($scope, $element, $attr) {
+      if(!$attr.href || $attr.href.indexOf('#') === -1) return;
+      var target = document.getElementById($attr.href.replace(/.*(?=#[^\s]+$)/, '').substring(1));
+      if(!target) return;
+      addSpy(target, $element, -($attr.offset ? parseInt($attr.offset, 10) : 0));
+    }
+  };
 });
\ No newline at end of file
diff --git a/angular-scroll.min.js b/angular-scroll.min.js
index 9255320..f916c62 100644
--- a/angular-scroll.min.js
+++ b/angular-scroll.min.js
@@ -1,2 +1,2 @@
-angular.module("duScroll",["duScroll.scroller","duScroll.scrollPosition","duScroll.requestAnimation","duScroll.smoothScroll"]),angular.module("duScroll.requestAnimation",[]).factory("requestAnimation",["$window","$timeout",function(a,b){return a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame||a.msRequestAnimationFrame||function(a){b(a,1e3/60)}}]),angular.module("duScroll.scrollPosition",["duScroll.requestAnimation"]).factory("scrollPosition",["$window","requestAnimation",function(a,b){var c=[],d=0,e=0,f=function(){e=d;for(var a=0;a<c.length;a++)c[a](e)};return angular.element(a).on("scroll",function(){d=this.scrollY,d!==e&&b(f)}),{observe:function(a){c.push(a)}}}]),angular.module("duScroll.scroller",["duScroll.requestAnimation"]).factory("scroller",["$window","requestAnimation",function(a,b){function c(a){return Math.pow(a,.7)}function d(d,e,f){if(!f)return a.scrollTo(d,e),void 0;var g={y:a.scrollY,x:a.scrollX},h={y:e-g.y,x:d-g.x},i=0,j=f/60,k=function(){i++;var d=i===j?1:c(i/j);a.scrollTo(g.x+Math.ceil(h.x*d),g.y+Math.ceil(h.y*d)),j>i&&b(k)};k()}function e(b,c,e){d(a.scrollX+(b||0),a.scrollY+(c||0),e)}return{scrollTo:d,scrollDelta:e}}]),angular.module("duScroll.smoothScroll",["duScroll.scroller"]).directive("smoothScroll",["scroller",function(a){return{link:function(b,c,d){var e=angular.element(c[0]);e.on("click",function(b){if(d.href&&0===d.href.indexOf("#")){var c=document.getElementById(d.href.substring(1));if(c){b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault();var e=c.getBoundingClientRect();e.top,a.scrollDelta(0,e.top,1e3)}}})}}}]);
+angular.module("duScroll",["duScroll.scroller","duScroll.scrollPosition","duScroll.scrollspy","duScroll.requestAnimation","duScroll.smoothScroll"]),angular.module("duScroll.requestAnimation",[]).factory("requestAnimation",["$window","$timeout",function(a,b){return a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame||a.msRequestAnimationFrame||function(a){b(a,1e3/60)}}]),angular.module("duScroll.scrollPosition",["duScroll.requestAnimation"]).factory("scrollPosition",["$window","requestAnimation",function(a,b){var c=[],d=0,e=0,f=function(){e=d;for(var a=0;a<c.length;a++)c[a](e)};return angular.element(a).on("scroll",function(){d=this.scrollY,d!==e&&b(f)}),{observe:function(a){c.push(a)}}}]),angular.module("duScroll.scroller",["duScroll.requestAnimation"]).factory("scroller",["$window","requestAnimation",function(a,b){function c(a){return Math.pow(a,.7)}function d(d,e,f){if(!f)return a.scrollTo(d,e),void 0;var g={y:a.scrollY,x:a.scrollX},h={y:Math.round(e-g.y),x:Math.round(d-g.x)};if(h.x||h.y){var i=0,j=Math.ceil(f/60),k=function(){i++;var d=i===j?1:c(i/j);a.scrollTo(g.x+Math.ceil(h.x*d),g.y+Math.ceil(h.y*d)),j>i&&b(k)};k()}}function e(b,c,e){d(a.scrollX+(b||0),a.scrollY+(c||0),e)}return{scrollTo:d,scrollDelta:e}}]),angular.module("duScroll.smoothScroll",["duScroll.scroller"]).directive("duSmoothScroll",["scroller",function(a){return{link:function(b,c,d){var e=angular.element(c[0]);e.on("click",function(b){if(d.href&&-1!==d.href.indexOf("#")){var c=document.getElementById(d.href.replace(/.*(?=#[^\s]+$)/,"").substring(1));if(c){b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault();var e=-(d.offset?parseInt(d.offset,10):0),f=c.getBoundingClientRect();f.top,a.scrollDelta(0,f.top+(isNaN(e)?0:e),1e3)}}})}}}]),angular.module("duScroll.scrollspy",["duScroll.scrollPosition"]).directive("duScrollspy",["scrollPosition",function(a){function b(){for(var a,b,c,f=0;f<e.length;f++)b=e[f],c=b.target.getBoundingClientRect(),c.top+b.offset<20&&-1*c.top<c.height&&(!a||a.top<c.top)&&(a={top:c.top,spy:b});a&&(a=a.spy),d!==a&&(d&&d.$element.removeClass("active"),a&&a.$element.addClass("active"),d=a)}function c(c,d,f){e.length||a.observe(b),e.push({target:c,$element:d,element:angular.element(d[0]),offset:f})}var d,e=[];return{link:function(a,b,d){if(d.href&&-1!==d.href.indexOf("#")){var e=document.getElementById(d.href.replace(/.*(?=#[^\s]+$)/,"").substring(1));e&&c(e,b,-(d.offset?parseInt(d.offset,10):0))}}}}]);
 //# sourceMappingURL=angular-scroll.min.js.map
\ No newline at end of file
diff --git a/angular-scroll.min.js.map b/angular-scroll.min.js.map
index 72beb06..e33c5b2 100644
--- a/angular-scroll.min.js.map
+++ b/angular-scroll.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"angular-scroll.min.js","sources":["angular-scroll.min.js"],"names":["angular","module","factory","$window","$timeout","requestAnimationFrame","webkitRequestAnimationFrame","mozRequestAnimationFrame","oRequestAnimationFrame","msRequestAnimationFrame","callback","requestAnimation","observers","lastScrollY","currentScrollY","executeCallbacks","i","length","element","on","this","scrollY","observe","cb","push","easeout","x","Math","pow","scrollTo","y","duration","start","scrollX","delta","frame","frames","animate","percent","ceil","scrollDelta","directive","scroller","link","$scope","$element","$attr","e","href","indexOf","elem","document","getElementById","substring","stopPropagation","preventDefault","pos","getBoundingClientRect","top"],"mappings":"AAAAA,QAAQC,OAAO,YACb,oBACA,0BACA,4BACA,0BAEFD,QAAQC,OAAO,gCAAiCC,QAAQ,oBACtD,UACA,WACA,SAAUC,EAASC,GACjB,MAAOD,GAAQE,uBAAyBF,EAAQG,6BAA+BH,EAAQI,0BAA4BJ,EAAQK,wBAA0BL,EAAQM,yBAA2B,SAAkBC,GACxMN,EAASM,EAAU,IAAO,QAIhCV,QAAQC,OAAO,2BAA4B,8BAA8BC,QAAQ,kBAC/E,UACA,mBACA,SAAUC,EAASQ,GACjB,GAAIC,MACAC,EAAc,EACdC,EAAiB,EACjBC,EAAmB,WACrBD,EAAiBD,CACjB,KAAK,GAAIG,GAAI,EAAGA,EAAIJ,EAAUK,OAAQD,IACpCJ,EAAUI,GAAGF,GASjB,OANAd,SAAQkB,QAAQf,GAASgB,GAAG,SAAU,WACpCN,EAAcO,KAAKC,QACfR,IAAgBC,GAClBH,EAAiBI,MAInBO,QAAS,SAAUC,GACjBX,EAAUY,KAAKD,QAKvBvB,QAAQC,OAAO,qBAAsB,8BAA8BC,QAAQ,YACzE,UACA,mBACA,SAAUC,EAASQ,GACjB,QAASc,GAAQC,GACf,MAAOC,MAAKC,IAAIF,EAAG,IAErB,QAASG,GAASH,EAAGI,EAAGC,GACtB,IAAKA,EAEH,MADA5B,GAAQ0B,SAASH,EAAGI,GACpB,MAEF,IAAIE,IACAF,EAAG3B,EAAQkB,QACXK,EAAGvB,EAAQ8B,SAEXC,GACAJ,EAAGA,EAAIE,EAAMF,EACbJ,EAAGA,EAAIM,EAAMN,GAEbS,EAAQ,EACRC,EAASL,EAAW,GACpBM,EAAU,WACZF,GACA,IAAIG,GAAUH,IAAUC,EAAS,EAAIX,EAAQU,EAAQC,EACrDjC,GAAQ0B,SAASG,EAAMN,EAAIC,KAAKY,KAAKL,EAAMR,EAAIY,GAAUN,EAAMF,EAAIH,KAAKY,KAAKL,EAAMJ,EAAIQ,IAC3EF,EAARD,GACFxB,EAAiB0B,GAGrBA,KAEF,QAASG,GAAYd,EAAGI,EAAGC,GACzBF,EAAS1B,EAAQ8B,SAAWP,GAAK,GAAIvB,EAAQkB,SAAWS,GAAK,GAAIC,GAEnE,OACEF,SAAUA,EACVW,YAAaA,MAInBxC,QAAQC,OAAO,yBAA0B,sBAAsBwC,UAAU,gBACvE,WACA,SAAUC,GACR,OACEC,KAAM,SAAUC,EAAQC,EAAUC,GAChC,GAAI5B,GAAUlB,QAAQkB,QAAQ2B,EAAS,GACvC3B,GAAQC,GAAG,QAAS,SAAU4B,GAC5B,GAAKD,EAAME,MAAoC,IAA5BF,EAAME,KAAKC,QAAQ,KAAtC,CAEA,GAAIC,GAAOC,SAASC,eAAeN,EAAME,KAAKK,UAAU,GACxD,IAAKH,EAAL,CAEIH,EAAEO,iBACJP,EAAEO,kBACAP,EAAEQ,gBACJR,EAAEQ,gBACJ,IAAIC,GAAMN,EAAKO,uBACHD,GAAIE,IAChBhB,EAASF,YAAY,EAAGgB,EAAIE,IAAK"}
\ No newline at end of file
+{"version":3,"file":"angular-scroll.min.js","sources":["angular-scroll.min.js"],"names":["angular","module","factory","$window","$timeout","requestAnimationFrame","webkitRequestAnimationFrame","mozRequestAnimationFrame","oRequestAnimationFrame","msRequestAnimationFrame","callback","requestAnimation","observers","lastScrollY","currentScrollY","executeCallbacks","i","length","element","on","this","scrollY","observe","cb","push","easeout","x","Math","pow","scrollTo","y","duration","start","scrollX","delta","round","frame","frames","ceil","animate","percent","scrollDelta","directive","scroller","link","$scope","$element","$attr","e","href","indexOf","elem","document","getElementById","replace","substring","stopPropagation","preventDefault","offset","parseInt","pos","getBoundingClientRect","top","isNaN","scrollPosition","gotScroll","toBeActive","spy","spies","target","height","currentlyActive","removeClass","addClass","addSpy"],"mappings":"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"}
\ No newline at end of file
diff --git a/bower.json b/bower.json
index b3f1d87..8d47bdd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-scroll",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "angular-scroll.min.js",
   "ignore": [
     "**/.*",
diff --git a/package.json b/package.json
index 0c2a8e7..1094f31 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "angular-scroll",
-  "version": "0.1.0",
-  "description": "Scroll event listener and animated scrollTo",
-  "keywords": ["angular", "smooth-scroll", "scrollTo", "scrolling"],
+  "version": "0.2.0",
+  "description": "Scrollspy, animated scrollTo and scroll events",
+  "keywords": ["angular", "smooth-scroll", "scrollspy", "scrollTo", "scrolling"],
   "main": "angular-scroll.min.js",
   "repository": {
     "type": "git",