diff --git a/bower.json b/bower.json
index dd4fa24..67c6184 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "midnight",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Switch fixed headers on the fly",
   "main": "midnight.jquery.js",
   "homepage": "https://github.com/Aerolab/midnight.js",
diff --git a/index.html b/index.html
index fd31cfc..7391f52 100644
--- a/index.html
+++ b/index.html
@@ -67,7 +67,7 @@
 
 
   <div class="top-links" data-midnight="white">
-    <a class="button" href="https://aerolab.github.io/midnight.js/midnight.jquery.js" download>Download</a>
+    <a class="button" href="https://aerolab.github.io/midnight.js/midnight.jquery.min.js" download>Download</a>
     <a class="button button-github" href="https://github.com/Aerolab/midnight.js" target="_blank">Fork on GitHub</a>
   </div>
 
@@ -172,7 +172,7 @@ <h2>The jQuery Plugin</h2>
         <p>To make everything work, just load midnight (and jQuery) and initialize it. We take care of the rest.</p>
       </div>
 
-      <pre class="line-numbers wow fadeInRight"><code class="language-markup">&lt;script src="midnight.jquery.js"&gt;&lt;/script&gt;
+      <pre class="line-numbers wow fadeInRight"><code class="language-markup">&lt;script src="midnight.jquery.min.js"&gt;&lt;/script&gt;
 &lt;script&gt;
 // Start midnight
 $(document).ready(function(){
@@ -224,7 +224,7 @@ <h2>Further customization</h2>
     
       <div class="container">
         <div class="buttons wow fadeIn">
-          <a class="button" href="https://aerolab.github.io/midnight.js/midnight.jquery.js" download>Download</a>
+          <a class="button" href="https://aerolab.github.io/midnight.js/midnight.jquery.min.js" download>Download</a>
           <a class="button" href="https://github.com/Aerolab/midnight.js" target="_blank"><i class="icon-github"></i> Fork on GitHub</a>
         </div>
       </div>
@@ -243,7 +243,7 @@ <h2>Further customization</h2>
   <script src="assets/js/prism.js"></script>
   <script src="assets/js/wow.min.js"></script>
   <script src="assets/js/viewport-units-buggyfill.js"></script>
-  <script src="midnight.jquery.js"></script>
+  <script src="midnight.jquery.min.js"></script>
   <script>
 
 
diff --git a/midnight.jquery.js b/midnight.jquery.js
index ab7d569..4a717fe 100644
--- a/midnight.jquery.js
+++ b/midnight.jquery.js
@@ -1,5 +1,5 @@
 /*!
- * Midnight.js 1.0.2
+ * Midnight.js 1.0.3
  * jQuery plugin to switch between multiple fixed header designs on the fly, so it looks in line with the content below it.
  * http://aerolab.github.io/midnight.js/
  *
@@ -37,6 +37,7 @@
 
       // Scroll Cache
       var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+      var documentHeight = $(document).height();
 
       // Cache all the switchable headers (different colors)
       var $originalHeader = $(this);
@@ -232,6 +233,8 @@
 
       var recalculateSections = function(){
 
+        documentHeight = $(document).height();
+
         // Cache all the sections and their start/end positions (where the class starts and ends)
         sections = [];
 
@@ -260,7 +263,7 @@
         scrollTop = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop;
         // Some browsers (e.g on OS X) allow scrolling past the top/bottom.
         scrollTop = Math.max(scrollTop, 0);
-        scrollTop = Math.min(scrollTop, $(document).height());
+        scrollTop = Math.min(scrollTop, documentHeight);
 
         // Get the header's position relative to the document (given that it's fixed)
         var headerHeight = headerInfo.height;
diff --git a/midnight.jquery.min.js b/midnight.jquery.min.js
index 62ba71b..7b60d4b 100644
--- a/midnight.jquery.min.js
+++ b/midnight.jquery.min.js
@@ -1,5 +1,5 @@
 /*!
- * Midnight.js 1.0.2
+ * Midnight.js 1.0.3
  * jQuery plugin to switch between multiple fixed header designs on the fly, so it looks in line with the content below it.
  * http://aerolab.github.io/midnight.js/
  *
@@ -8,4 +8,4 @@
  * Released under the MIT license
  * http://aerolab.github.io/midnight.js/LICENSE.txt
  */
- !function(e){e.fn.midnight=function(t){return"object"!=typeof t&&(t={}),this.each(function(){var s={headerClass:"midnightHeader",innerClass:"midnightInner",defaultClass:"default"};e.extend(s,t);var a=window.pageYOffset||document.documentElement.scrollTop,n=e(this),r={},o={top:0,height:n.outerHeight()},l=e("[data-midnight]"),d=[],f=function(){for(var e="transform WebkitTransform MozTransform OTransform msTransform".split(" "),t=0;t<e.length;t++)if(void 0!==document.createElement("div").style[e[t]])return e[t];return!1},h=f();if(0!=l.length){var m=function(){var t=n.find("> ."+s.headerClass),a=0,i=0;return t.length?t.each(function(){var t=e(this),n=t.find("> ."+s.innerClass);n.length?(n.css("bottom","auto"),i=n.outerHeight(),n.css("bottom","0")):(t.css("bottom","auto"),i=t.outerHeight(),t.css("bottom","0")),a=i>a?i:a}):a=i=n.outerHeight(),a},c=function(){o.height=m(),n.css("height",o.height+"px")},u=function(){r["default"]={},l.each(function(){var t=e(this),s=t.data("midnight");"string"==typeof s&&(s=s.trim(),""!==s&&(r[s]={}))});({top:n.css("padding-top"),right:n.css("padding-right"),bottom:n.css("padding-bottom"),left:n.css("padding-left")});n.css({position:"fixed",top:0,left:0,right:0,overflow:"hidden"}),c();var t=n.find("> ."+s.headerClass);t.length?t.filter("."+s.defaultClass).length||t.filter("."+s.headerClass+":first").clone(!0,!0).attr("class",s.headerClass+" "+s.defaultClass):n.wrapInner('<div class="'+s.headerClass+" "+s.defaultClass+'"></div>');var t=n.find("> ."+s.headerClass),a=t.filter("."+s.defaultClass).clone(!0,!0);for(headerClass in r)if("undefined"==typeof r[headerClass].element){var i=t.filter("."+headerClass);r[headerClass].element=i.length?i:a.clone(!0,!0).removeClass(s.defaultClass).addClass(headerClass).appendTo(n);var o={position:"absolute",overflow:"hidden",top:0,left:0,right:0,bottom:0};r[headerClass].element.css(o),h!==!1&&r[headerClass].element.css(h,"translateZ(0)"),r[headerClass].element.find("> ."+s.innerClass).length||r[headerClass].element.wrapInner('<div class="'+s.innerClass+'"></div>'),r[headerClass].inner=r[headerClass].element.find("> ."+s.innerClass),r[headerClass].inner.css(o),h!==!1&&r[headerClass].inner.css(h,"translateZ(0)"),r[headerClass].from="",r[headerClass].progress=0}t.each(function(){var t=e(this),a=!1;for(headerClass in r)t.hasClass(headerClass)&&(a=!0);t.find("> ."+s.innerClass).length||t.wrapInner('<div class="'+s.innerClass+'"></div>'),a||t.hide()})};u();var p=function(){for(d=[],i=0;i<l.length;i++){var t=e(l[i]);d.push({element:t,"class":t.data("midnight"),start:t.offset().top,end:t.offset().top+t.outerHeight()})}};setInterval(p,1e3);var g=function(){a=window.pageYOffset||document.body.scrollTop||document.documentElement.scrollTop,a=Math.max(a,0),a=Math.min(a,e(document).height());var t=o.height,s=a+o.top,n=a+o.top+t;for(ix in r)r[ix].from="",r[ix].progress=0;for(ix in d)n>=d[ix].start&&s<=d[ix].end&&(r[d[ix].class].visible=!0,s>=d[ix].start&&n<=d[ix].end?(r[d[ix].class].from="top",r[d[ix].class].progress+=1):n>d[ix].end&&s<d[ix].end?(r[d[ix].class].from="top",r[d[ix].class].progress=1-(n-d[ix].end)/t):n>d[ix].start&&s<d[ix].start&&("top"===r[d[ix].class].from?r[d[ix].class].progress+=(n-d[ix].start)/t:(r[d[ix].class].from="bottom",r[d[ix].class].progress=(n-d[ix].start)/t)))},x=function(){var e=0,t="";for(ix in r)""!==!r[ix].from&&(e+=r[ix].progress,t=ix);1>e&&(""===r[s.defaultClass].from?(r[s.defaultClass].from="top"===r[t].from?"bottom":"top",r[s.defaultClass].progress=1-e):r[s.defaultClass].progress+=1-e);for(ix in r)if(""!==!r[ix].from){var a=100*(1-r[ix].progress);"top"===r[ix].from?h!==!1?(r[ix].element[0].style[h]="translateY(-"+a+"%) translateZ(0)",r[ix].inner[0].style[h]="translateY(+"+a+"%) translateZ(0)"):(r[ix].element[0].style.top="-"+a+"%",r[ix].inner[0].style.top="+"+a+"%"):h!==!1?(r[ix].element[0].style[h]="translateY(+"+a+"%) translateZ(0)",r[ix].inner[0].style[h]="translateY(-"+a+"%) translateZ(0)"):(r[ix].element.style.top="+"+a+"%",r[ix].inner.style.top="-"+a+"%")}};e(window).resize(function(){p(),c(),g(),x()}).trigger("resize"),requestAnimationFrame=window.requestAnimationFrame||function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();var C=function(){requestAnimationFrame(C),g(),x()};C()}})}}(jQuery);
\ No newline at end of file
+ !function(e){e.fn.midnight=function(t){return"object"!=typeof t&&(t={}),this.each(function(){var s={headerClass:"midnightHeader",innerClass:"midnightInner",defaultClass:"default"};e.extend(s,t);var a=window.pageYOffset||document.documentElement.scrollTop,n=e(document).height(),r=e(this),o={},l={top:0,height:r.outerHeight()},d=e("[data-midnight]"),f=[],h=function(){for(var e="transform WebkitTransform MozTransform OTransform msTransform".split(" "),t=0;t<e.length;t++)if(void 0!==document.createElement("div").style[e[t]])return e[t];return!1},m=h();if(0!=d.length){var c=function(){var t=r.find("> ."+s.headerClass),a=0,n=0;return t.length?t.each(function(){var t=e(this),i=t.find("> ."+s.innerClass);i.length?(i.css("bottom","auto"),n=i.outerHeight(),i.css("bottom","0")):(t.css("bottom","auto"),n=t.outerHeight(),t.css("bottom","0")),a=n>a?n:a}):a=n=r.outerHeight(),a},u=function(){l.height=c(),r.css("height",l.height+"px")},g=function(){o["default"]={},d.each(function(){var t=e(this),s=t.data("midnight");"string"==typeof s&&(s=s.trim(),""!==s&&(o[s]={}))});({top:r.css("padding-top"),right:r.css("padding-right"),bottom:r.css("padding-bottom"),left:r.css("padding-left")});r.css({position:"fixed",top:0,left:0,right:0,overflow:"hidden"}),u();var t=r.find("> ."+s.headerClass);t.length?t.filter("."+s.defaultClass).length||t.filter("."+s.headerClass+":first").clone(!0,!0).attr("class",s.headerClass+" "+s.defaultClass):r.wrapInner('<div class="'+s.headerClass+" "+s.defaultClass+'"></div>');var t=r.find("> ."+s.headerClass),a=t.filter("."+s.defaultClass).clone(!0,!0);for(headerClass in o)if("undefined"==typeof o[headerClass].element){var n=t.filter("."+headerClass);o[headerClass].element=n.length?n:a.clone(!0,!0).removeClass(s.defaultClass).addClass(headerClass).appendTo(r);var i={position:"absolute",overflow:"hidden",top:0,left:0,right:0,bottom:0};o[headerClass].element.css(i),m!==!1&&o[headerClass].element.css(m,"translateZ(0)"),o[headerClass].element.find("> ."+s.innerClass).length||o[headerClass].element.wrapInner('<div class="'+s.innerClass+'"></div>'),o[headerClass].inner=o[headerClass].element.find("> ."+s.innerClass),o[headerClass].inner.css(i),m!==!1&&o[headerClass].inner.css(m,"translateZ(0)"),o[headerClass].from="",o[headerClass].progress=0}t.each(function(){var t=e(this),a=!1;for(headerClass in o)t.hasClass(headerClass)&&(a=!0);t.find("> ."+s.innerClass).length||t.wrapInner('<div class="'+s.innerClass+'"></div>'),a||t.hide()})};g();var p=function(){for(n=e(document).height(),f=[],i=0;i<d.length;i++){var t=e(d[i]);f.push({element:t,"class":t.data("midnight"),start:t.offset().top,end:t.offset().top+t.outerHeight()})}};setInterval(p,1e3);var x=function(){a=window.pageYOffset||document.body.scrollTop||document.documentElement.scrollTop,a=Math.max(a,0),a=Math.min(a,n);var e=l.height,t=a+l.top,s=a+l.top+e;for(ix in o)o[ix].from="",o[ix].progress=0;for(ix in f)s>=f[ix].start&&t<=f[ix].end&&(o[f[ix].class].visible=!0,t>=f[ix].start&&s<=f[ix].end?(o[f[ix].class].from="top",o[f[ix].class].progress+=1):s>f[ix].end&&t<f[ix].end?(o[f[ix].class].from="top",o[f[ix].class].progress=1-(s-f[ix].end)/e):s>f[ix].start&&t<f[ix].start&&("top"===o[f[ix].class].from?o[f[ix].class].progress+=(s-f[ix].start)/e:(o[f[ix].class].from="bottom",o[f[ix].class].progress=(s-f[ix].start)/e)))},C=function(){var e=0,t="";for(ix in o)""!==!o[ix].from&&(e+=o[ix].progress,t=ix);1>e&&(""===o[s.defaultClass].from?(o[s.defaultClass].from="top"===o[t].from?"bottom":"top",o[s.defaultClass].progress=1-e):o[s.defaultClass].progress+=1-e);for(ix in o)if(""!==!o[ix].from){var a=100*(1-o[ix].progress);"top"===o[ix].from?m!==!1?(o[ix].element[0].style[m]="translateY(-"+a+"%) translateZ(0)",o[ix].inner[0].style[m]="translateY(+"+a+"%) translateZ(0)"):(o[ix].element[0].style.top="-"+a+"%",o[ix].inner[0].style.top="+"+a+"%"):m!==!1?(o[ix].element[0].style[m]="translateY(+"+a+"%) translateZ(0)",o[ix].inner[0].style[m]="translateY(-"+a+"%) translateZ(0)"):(o[ix].element.style.top="+"+a+"%",o[ix].inner.style.top="-"+a+"%")}};e(window).resize(function(){p(),u(),x(),C()}).trigger("resize"),requestAnimationFrame=window.requestAnimationFrame||function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();var v=function(){requestAnimationFrame(v),x(),C()};v()}})}}(jQuery);
\ No newline at end of file
diff --git a/midnight.jquery.src.js b/midnight.jquery.src.js
index f39ccc0..09bcaf3 100644
--- a/midnight.jquery.src.js
+++ b/midnight.jquery.src.js
@@ -27,6 +27,7 @@
 
       // Scroll Cache
       var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+      var documentHeight = $(document).height();
 
       // Cache all the switchable headers (different colors)
       var $originalHeader = $(this);
@@ -222,6 +223,8 @@
 
       var recalculateSections = function(){
 
+        documentHeight = $(document).height();
+
         // Cache all the sections and their start/end positions (where the class starts and ends)
         sections = [];
 
@@ -248,6 +251,9 @@
 
         // Check classes are currently active in the header (including the current percentage of each)
         scrollTop = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop;
+        // Some browsers (e.g on OS X) allow scrolling past the top/bottom.
+        scrollTop = Math.max(scrollTop, 0);
+        scrollTop = Math.min(scrollTop, documentHeight);
 
         // Get the header's position relative to the document (given that it's fixed)
         var headerHeight = headerInfo.height;
diff --git a/package.json b/package.json
index df2e6bc..dc268a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Midnight.JS",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A jQuery plugin to switch fixed headers on the fly",
   "devDependencies": {
     "gulp": "^3.8.8",