diff --git a/README.md b/README.md
index f047568..772085b 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,16 @@
-# GitBook Plugin: InTopic TOC
+# GitBook plugin: InTopic TOC
 
-This GitBook Plugin adds an inline table of contents (TOC) to each page based on configurable selectors. Inline TOC can be enabled or disabled by default or on individual pages. TOC is placed on the right side and moves to top for smaller devices automatically.
+![Build Status](https://api.travis-ci.org/zanfab/gitbook-plugin-intopic-toc.svg)
+[![npm version](https://img.shields.io/npm/v/gitbook-plugin-intopic-toc/latest.svg)](https://www.npmjs.com/package/gitbook-plugin-intopic-toc)
+
+This GitBook plugin adds an inline table of contents (TOC) to each page based on configurable selectors. Inline TOC can be enabled or disabled by default or on individual pages. TOC is placed on the right side and moves to top for smaller devices automatically.
 
 Inline TOC stays at the top of the page when scrolling using a sticky effect. Current position is highlighted by a scrollspy effect.
 
 ![Inline TOC in desktop and mobile mode](https://user-images.githubusercontent.com/44210522/50728477-ab322680-112a-11e9-92da-4de20e17758d.png)
 
+Plugin uses [gumshoe](https://github.com/cferdinandi/gumshoe) and [anchorjs](https://github.com/bryanbraun/anchorjs) to implement functionality.
+
 ## Installation
 
 ### Step #1 - Update book.json file
@@ -85,12 +90,11 @@ For basic usage, the only thing you have to do is install the plugin. For advanc
 }
 ```
 
-* selector : Selector used to find elements to put anchors on.
-  * Default: .markdown-section h2
-* visible: Defines whether to show the navigation on every page.
-  * Default: true.
-* label: Label which is used as heading for the navigation. Could be a single string or an object for multilingual setups.
-  * Default: In this article
+| Property | Description                                                  | Default value        |
+| -------- | ------------------------------------------------------------ | -------------------- |
+| selector | Selector used to find elements to put anchors on             | .markdown-section h2 |
+| visible  | Defines whether to show the navigation on every page         | true                 |
+| label    | Label which is used as heading for the navigation. Could be a single string or an object for multilingual setups | In this article      |
 
 If `visible` parameter set to true and you want to hide the TOC on a single page, add the front matter item `isTocVisible: false` to the top of the Markdown file like this:
 
@@ -110,4 +114,7 @@ The specific front matter `isTocVisible` overrides the `visible` parameter from
 If inline TOC does not look as expected, check if your `book.json` is valid according to this documentation.
 
 ## Changelog
+
+01/07/2019 - Used [gumshoe scrollspy script](https://github.com/cferdinandi/gumshoe)  for a better experience
+
 01/05/2019 - Initial Release
diff --git a/book/gumshoe.min.js b/book/gumshoe.min.js
new file mode 100644
index 0000000..d167755
--- /dev/null
+++ b/book/gumshoe.min.js
@@ -0,0 +1,2 @@
+/*! gumshoejs v3.5.1 | (c) 2018 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/gumshoe */
+!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.gumshoe=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(c){"use strict";var i,t,s,n,o,r,a={},l=[],u={selector:"[data-gumshoe] a",selectorHeader:"[data-gumshoe-header]",container:c,offset:0,activeClass:"active",scrollDelay:!1,callback:function(){}},d=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;r<a;r++)t.call(n,e[r],r,e)},f=function(){var n={},o=!1,e=0,t=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(o=arguments[0],e++);for(var r=function(e){for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&(o&&"[object Object]"===Object.prototype.toString.call(e[t])?n[t]=f(!0,n[t],e[t]):n[t]=e[t])};e<t;e++){r(arguments[e])}return n},v=function(e){var t=0;if(e.offsetParent)for(;t+=e.offsetTop,e=e.offsetParent;);else t=e.offsetTop;return 0<=(t=t-o-i.offset)?t:0},g=function(e){var t=e.getBoundingClientRect();return 0<=t.top&&0<=t.left&&t.bottom<=(c.innerHeight||document.documentElement.clientHeight)&&t.right<=(c.innerWidth||document.documentElement.clientWidth)};a.setDistances=function(){var e;s=Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight),o=n?(e=n,Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)+v(n)):0,d(l,function(e){e.distance=v(e.target)}),l.sort(function(e,t){return e.distance>t.distance?-1:e.distance<t.distance?1:0})};var m=function(){r&&(r.nav.classList.remove(i.activeClass),r.parent&&r.parent.classList.remove(i.activeClass))},p=function(e){m(),e.nav.classList.add(i.activeClass),e.parent&&e.parent.classList.add(i.activeClass),i.callback(e),r={nav:e.nav,parent:e.parent}};a.getCurrentNav=function(){var e=i.container==window?"pageYOffset":"scrollTop",t=i.container[e];if(c.innerHeight+t>=s&&g(l[0].target))return p(l[0]),l[0];var n=l[l.length-1];if(t<n.distance&&g(n.target))return p(n),n;for(var o=0,r=l.length;o<r;o++){var a=l[o];if(a.distance<=t)return p(a),a}console.log("dd"),m(),i.callback()};a.destroy=function(){i&&(i.container.removeEventListener("resize",y,!1),i.container.removeEventListener("scroll",y,!1),l=[],r=o=n=s=t=i=null)};var h=function(e){window.clearTimeout(t),t=setTimeout(function(){a.setDistances(),a.getCurrentNav()},66)},y=function(e){t||(t=setTimeout(function(){t=null,"scroll"===e.type&&a.getCurrentNav(),"resize"===e.type&&(a.setDistances(),a.getCurrentNav())},66))};return a.init=function(e){var t;"querySelector"in document&&"addEventListener"in c&&"classList"in document.createElement("_")&&(a.destroy(),i=f(u,e||{}),n=document.querySelector(i.selectorHeader),t=document.querySelectorAll(i.selector),d(t,function(e){if(e.hash){var t=document.querySelector(e.hash);t&&l.push({nav:e,target:t,parent:"li"===e.parentNode.tagName.toLowerCase()?e.parentNode:null,distance:0})}}),0!==l.length&&(d(l,function(e){e.nav.classList.contains(i.activeClass)&&(r={nav:e.nav,parent:e.parent})}),a.setDistances(),a.getCurrentNav(),i.container.addEventListener("resize",y,!1),i.scrollDelay?i.container.addEventListener("scroll",h,!1):i.container.addEventListener("scroll",y,!1)))},a});
\ No newline at end of file
diff --git a/book/plugin.js b/book/plugin.js
index 2b34bb0..a1973f0 100644
--- a/book/plugin.js
+++ b/book/plugin.js
@@ -51,13 +51,19 @@ require(["gitbook", "jQuery"], function(gitbook, $) {
             var section = document.body.querySelector('.page-wrapper');
             section.appendChild(navigation, section.firstChild);
 
-            $(".book-body .body-inner").scroll(onScroll);
+            gumshoe.init({
+                container: $(".book-body .body-inner")[0],
+                offset: 20,
+                scrollDelay: false,
+                activeClass: 'selected'
+            });
         }
     });
 });
 
 function buildNavigation(elements) {
     var navigation = document.createElement('nav');
+    navigation.setAttribute('data-gumshoe-header', '');
     navigation.className = 'intopic-toc';
 
     var heading = document.createElement('h3');
@@ -65,6 +71,7 @@ function buildNavigation(elements) {
     navigation.appendChild(heading);
 
     var container = document.createElement('ol');
+    container.setAttribute('data-gumshoe', '');
     navigation.appendChild(container);
 
     for (var i = 0; i < elements.length; i++) {
@@ -87,29 +94,3 @@ function buildNavigation(elements) {
 
     return navigation;
 }
-
-function onScroll(e) {
-    const currentPosition = $(e.target).scrollTop() + $('.book-header').height();
-
-    for (var i = 0; i < anchors.elements.length; i++) {
-        const section = anchors.elements[i];
-        const isInView = $(section).offset().top < currentPosition;
-
-        if (isInView) {
-            const menuItemID = section.getAttribute('id');
-            const activeItem = $(`.intopic-toc ol li`).has(`a[href="#${menuItemID}"]`);
-            
-            if (!activeItem) {
-                return;
-            }
-
-            $('.intopic-toc ol li').each(function() {
-                $(this).attr('data-active', 'false');
-                $(this).removeClass('selected');
-            });
-
-            $(activeItem).attr('data-active', 'true');
-            $(activeItem).addClass('selected');
-        }
-    }
-}
diff --git a/index.js b/index.js
index 604dd95..aafd859 100644
--- a/index.js
+++ b/index.js
@@ -3,6 +3,7 @@ module.exports = {
         assets: "./book",
         js: [
             "anchor.min.js",
+            "gumshoe.min.js",
             "plugin.js"
         ],
         css: [
diff --git a/package-lock.json b/package-lock.json
index ca4732b..2ae624b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
   "name": "gitbook-plugin-intopic-toc",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 1
 }
diff --git a/package.json b/package.json
index 798eb32..394658f 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "gitbook-plugin-intopic-toc",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "GitBook Plugin to add inline table of contents (TOC) to each page based on configurable selectors.",
   "keywords": [
     "gitbook",
     "plugin",
     "toc",
-    "anchor"
+    "anchor",
+    "table-of-contents"
   ],
   "author": "Fabian Zankl",
   "license": "MIT",