diff --git a/placeholders/Gruntfile.js b/placeholders/Gruntfile.js
index cfc4de3..a5fdd67 100644
--- a/placeholders/Gruntfile.js
+++ b/placeholders/Gruntfile.js
@@ -19,7 +19,7 @@ module.exports = function(grunt) {
             return code
           }
         },
-        url: 'https://raw.github.com/jamesallardice/Placeholders.js/v<%= pkg.version %>/lib/main.js',
+        url: 'https://raw.github.com/jamesallardice/Placeholders.js/<%= pkg.version %>/lib/main.js',
         name: 'placeholders.js'
       },
       utils: {
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
             return code
           }
         },
-        url: 'https://raw.github.com/jamesallardice/Placeholders.js/v<%= pkg.version %>/lib/utils.js',
+        url: 'https://raw.github.com/jamesallardice/Placeholders.js/<%= pkg.version %>/lib/utils.js',
         name: 'utils.js'
       }
     }
diff --git a/placeholders/dist/placeholders-debug.js b/placeholders/dist/placeholders-debug.js
index f1db812..4e75f78 100644
--- a/placeholders/dist/placeholders-debug.js
+++ b/placeholders/dist/placeholders-debug.js
@@ -1,4 +1,4 @@
-define("gallery/placeholders/3.0.0/placeholders-debug", [ "./utils-debug" ], function(require, exports, module) {
+define("gallery/placeholders/3.0.1/placeholders-debug", [ "./utils-debug" ], function(require, exports, module) {
     require("./utils-debug");
     (function(global) {
         "use strict";
@@ -23,6 +23,15 @@ define("gallery/placeholders/3.0.0/placeholders-debug", [ "./utils-debug" ], fun
         test = document.createElement("input"), head = document.getElementsByTagName("head")[0], root = document.documentElement, Placeholders = global.Placeholders, Utils = Placeholders.Utils, hideOnInput, liveUpdates, keydownVal, styleElem, styleRules, placeholder, timer, form, elem, len, i;
         // No-op (used in place of public methods when native support is detected)
         function noop() {}
+        // Avoid IE9 activeElement of death when an iframe is used.
+        // More info:
+        // http://bugs.jquery.com/ticket/13393
+        // https://github.com/jquery/jquery/commit/85fc5878b3c6af73f42d61eedf73013e7faae408
+        function safeActiveElement() {
+            try {
+                return document.activeElement;
+            } catch (err) {}
+        }
         // Hide the placeholder value on a single element. Returns true if the placeholder was hidden and false if it was not (because it wasn't visible in the first place)
         function hidePlaceholder(elem, keydownValue) {
             var type, maxLength, valueChanged = !!keydownValue && elem.value !== keydownValue, isPlaceholderValue = elem.value === elem.getAttribute(ATTR_CURRENT_VAL);
@@ -141,7 +150,7 @@ define("gallery/placeholders/3.0.0/placeholders-debug", [ "./utils-debug" ], fun
         }
         function makeClickHandler(elem) {
             return function() {
-                if (elem === document.activeElement && elem.value === elem.getAttribute(ATTR_CURRENT_VAL) && elem.getAttribute(ATTR_ACTIVE) === "true") {
+                if (elem === safeActiveElement() && elem.value === elem.getAttribute(ATTR_CURRENT_VAL) && elem.getAttribute(ATTR_ACTIVE) === "true") {
                     Utils.moveCaret(elem, 0);
                 }
             };
@@ -177,7 +186,7 @@ define("gallery/placeholders/3.0.0/placeholders-debug", [ "./utils-debug" ], fun
             elem.setAttribute(ATTR_EVENTS_BOUND, "true");
             elem.setAttribute(ATTR_CURRENT_VAL, placeholder);
             // If the element doesn't have a value and is not focussed, set it to the placeholder string
-            if (hideOnInput || elem !== document.activeElement) {
+            if (hideOnInput || elem !== safeActiveElement()) {
                 showPlaceholder(elem);
             }
         }
@@ -254,6 +263,9 @@ define("gallery/placeholders/3.0.0/placeholders-debug", [ "./utils-debug" ], fun
                 }
             }, 100);
         }
+        Utils.addEventListener(global, "beforeunload", function() {
+            disablePlaceholders();
+        });
         // Expose public methods
         Placeholders.disable = Placeholders.nativeSupport ? noop : disablePlaceholders;
         Placeholders.enable = Placeholders.nativeSupport ? noop : enablePlaceholders;
@@ -266,7 +278,7 @@ define("gallery/placeholders/3.0.0/placeholders-debug", [ "./utils-debug" ], fun
     }
 });
 
-define("gallery/placeholders/3.0.0/utils-debug", [], function(require, exports, module) {
+define("gallery/placeholders/3.0.1/utils-debug", [], function(require, exports, module) {
     /* 
  * The MIT License
  *
diff --git a/placeholders/dist/placeholders.js b/placeholders/dist/placeholders.js
index a2f9b92..7df98c9 100644
--- a/placeholders/dist/placeholders.js
+++ b/placeholders/dist/placeholders.js
@@ -1 +1 @@
-define("gallery/placeholders/3.0.0/placeholders",["./utils"],function(a,b,c){a("./utils"),function(a){"use strict";function b(){}function c(a,b){var c,d,e=!!b&&a.value!==b,f=a.value===a.getAttribute(G);return(e||f)&&"true"===a.getAttribute(H)?(a.removeAttribute(H),a.value=a.value.replace(a.getAttribute(G),""),a.className=a.className.replace(F,""),d=a.getAttribute(N),d&&(a.setAttribute("maxLength",d),a.removeAttribute(N)),c=a.getAttribute(I),c&&(a.type=c),!0):!1}function d(a){var b,c,d=a.getAttribute(G);return""===a.value&&d?(a.setAttribute(H,"true"),a.value=d,a.className+=" "+E,c=a.getAttribute(N),c||(a.setAttribute(N,a.maxLength),a.removeAttribute("maxLength")),b=a.getAttribute(I),b?a.type="text":"password"===a.type&&S.changeType(a,"text")&&a.setAttribute(I,"password"),!0):!1}function e(a,b){var c,d,e,f,g;if(a&&a.getAttribute(G))b(a);else for(c=a?a.getElementsByTagName("input"):o,d=a?a.getElementsByTagName("textarea"):p,g=0,f=c.length+d.length;f>g;g++)e=g<c.length?c[g]:d[g-c.length],b(e)}function f(a){e(a,c)}function g(a){e(a,d)}function h(a){return function(){q&&a.value===a.getAttribute(G)&&"true"===a.getAttribute(H)?S.moveCaret(a,0):c(a)}}function i(a){return function(){d(a)}}function j(a){return function(b){return s=a.value,"true"===a.getAttribute(H)&&s===a.getAttribute(G)&&S.inArray(C,b.keyCode)?(b.preventDefault&&b.preventDefault(),!1):void 0}}function k(a){return function(){c(a,s),""===a.value&&(a.blur(),S.moveCaret(a,0))}}function l(a){return function(){a===document.activeElement&&a.value===a.getAttribute(G)&&"true"===a.getAttribute(H)&&S.moveCaret(a,0)}}function m(a){return function(){f(a)}}function n(a){a.form&&(x=a.form,x.getAttribute(J)||(S.addEventListener(x,"submit",m(x)),x.setAttribute(J,"true"))),S.addEventListener(a,"focus",h(a)),S.addEventListener(a,"blur",i(a)),q&&(S.addEventListener(a,"keydown",j(a)),S.addEventListener(a,"keyup",k(a)),S.addEventListener(a,"click",l(a))),a.setAttribute(K,"true"),a.setAttribute(G,v),(q||a!==document.activeElement)&&d(a)}var o,p,q,r,s,t,u,v,w,x,y,z,A,B=["text","search","url","tel","email","password","number","textarea"],C=[27,33,34,35,36,37,38,39,40,8,46],D="#ccc",E="placeholdersjs",F=new RegExp("(?:^|\\s)"+E+"(?!\\S)"),G="data-placeholder-value",H="data-placeholder-active",I="data-placeholder-type",J="data-placeholder-submit",K="data-placeholder-bound",L="data-placeholder-focus",M="data-placeholder-live",N="data-placeholder-maxlength",O=document.createElement("input"),P=document.getElementsByTagName("head")[0],Q=document.documentElement,R=a.Placeholders,S=R.Utils;if(R.nativeSupport=void 0!==O.placeholder,!R.nativeSupport){for(o=document.getElementsByTagName("input"),p=document.getElementsByTagName("textarea"),q="false"===Q.getAttribute(L),r="false"!==Q.getAttribute(M),t=document.createElement("style"),t.type="text/css",u=document.createTextNode("."+E+" { color:"+D+"; }"),t.styleSheet?t.styleSheet.cssText=u.nodeValue:t.appendChild(u),P.insertBefore(t,P.firstChild),A=0,z=o.length+p.length;z>A;A++)y=A<o.length?o[A]:p[A-o.length],v=y.attributes.placeholder,v&&(v=v.nodeValue,v&&S.inArray(B,y.type)&&n(y));w=setInterval(function(){for(A=0,z=o.length+p.length;z>A;A++)y=A<o.length?o[A]:p[A-o.length],v=y.attributes.placeholder,v?(v=v.nodeValue,v&&S.inArray(B,y.type)&&(y.getAttribute(K)||n(y),(v!==y.getAttribute(G)||"password"===y.type&&!y.getAttribute(I))&&("password"===y.type&&!y.getAttribute(I)&&S.changeType(y,"text")&&y.setAttribute(I,"password"),y.value===y.getAttribute(G)&&(y.value=v),y.setAttribute(G,v)))):y.getAttribute(H)&&(c(y),y.removeAttribute(G));r||clearInterval(w)},100)}R.disable=R.nativeSupport?b:f,R.enable=R.nativeSupport?b:g}(this),c.exports=Placeholders;try{delete window.Placeholders}catch(d){window.Placeholders=null}}),define("gallery/placeholders/3.0.0/utils",[],function(){!function(a){"use strict";function b(a,b,c){return a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):void 0}function c(a,b){var c,d;for(c=0,d=a.length;d>c;c++)if(a[c]===b)return!0;return!1}function d(a,b){var c;a.createTextRange?(c=a.createTextRange(),c.move("character",b),c.select()):a.selectionStart&&(a.focus(),a.setSelectionRange(b,b))}function e(a,b){try{return a.type=b,!0}catch(c){return!1}}a.Placeholders={Utils:{addEventListener:b,inArray:c,moveCaret:d,changeType:e}}}(this)});
+define("gallery/placeholders/3.0.1/placeholders",["./utils"],function(a,b,c){a("./utils"),function(a){"use strict";function b(){}function c(){try{return document.activeElement}catch(a){}}function d(a,b){var c,d,e=!!b&&a.value!==b,f=a.value===a.getAttribute(H);return(e||f)&&"true"===a.getAttribute(I)?(a.removeAttribute(I),a.value=a.value.replace(a.getAttribute(H),""),a.className=a.className.replace(G,""),d=a.getAttribute(O),d&&(a.setAttribute("maxLength",d),a.removeAttribute(O)),c=a.getAttribute(J),c&&(a.type=c),!0):!1}function e(a){var b,c,d=a.getAttribute(H);return""===a.value&&d?(a.setAttribute(I,"true"),a.value=d,a.className+=" "+F,c=a.getAttribute(O),c||(a.setAttribute(O,a.maxLength),a.removeAttribute("maxLength")),b=a.getAttribute(J),b?a.type="text":"password"===a.type&&T.changeType(a,"text")&&a.setAttribute(J,"password"),!0):!1}function f(a,b){var c,d,e,f,g;if(a&&a.getAttribute(H))b(a);else for(c=a?a.getElementsByTagName("input"):p,d=a?a.getElementsByTagName("textarea"):q,g=0,f=c.length+d.length;f>g;g++)e=g<c.length?c[g]:d[g-c.length],b(e)}function g(a){f(a,d)}function h(a){f(a,e)}function i(a){return function(){r&&a.value===a.getAttribute(H)&&"true"===a.getAttribute(I)?T.moveCaret(a,0):d(a)}}function j(a){return function(){e(a)}}function k(a){return function(b){return t=a.value,"true"===a.getAttribute(I)&&t===a.getAttribute(H)&&T.inArray(D,b.keyCode)?(b.preventDefault&&b.preventDefault(),!1):void 0}}function l(a){return function(){d(a,t),""===a.value&&(a.blur(),T.moveCaret(a,0))}}function m(a){return function(){a===c()&&a.value===a.getAttribute(H)&&"true"===a.getAttribute(I)&&T.moveCaret(a,0)}}function n(a){return function(){g(a)}}function o(a){a.form&&(y=a.form,y.getAttribute(K)||(T.addEventListener(y,"submit",n(y)),y.setAttribute(K,"true"))),T.addEventListener(a,"focus",i(a)),T.addEventListener(a,"blur",j(a)),r&&(T.addEventListener(a,"keydown",k(a)),T.addEventListener(a,"keyup",l(a)),T.addEventListener(a,"click",m(a))),a.setAttribute(L,"true"),a.setAttribute(H,w),(r||a!==c())&&e(a)}var p,q,r,s,t,u,v,w,x,y,z,A,B,C=["text","search","url","tel","email","password","number","textarea"],D=[27,33,34,35,36,37,38,39,40,8,46],E="#ccc",F="placeholdersjs",G=new RegExp("(?:^|\\s)"+F+"(?!\\S)"),H="data-placeholder-value",I="data-placeholder-active",J="data-placeholder-type",K="data-placeholder-submit",L="data-placeholder-bound",M="data-placeholder-focus",N="data-placeholder-live",O="data-placeholder-maxlength",P=document.createElement("input"),Q=document.getElementsByTagName("head")[0],R=document.documentElement,S=a.Placeholders,T=S.Utils;if(S.nativeSupport=void 0!==P.placeholder,!S.nativeSupport){for(p=document.getElementsByTagName("input"),q=document.getElementsByTagName("textarea"),r="false"===R.getAttribute(M),s="false"!==R.getAttribute(N),u=document.createElement("style"),u.type="text/css",v=document.createTextNode("."+F+" { color:"+E+"; }"),u.styleSheet?u.styleSheet.cssText=v.nodeValue:u.appendChild(v),Q.insertBefore(u,Q.firstChild),B=0,A=p.length+q.length;A>B;B++)z=B<p.length?p[B]:q[B-p.length],w=z.attributes.placeholder,w&&(w=w.nodeValue,w&&T.inArray(C,z.type)&&o(z));x=setInterval(function(){for(B=0,A=p.length+q.length;A>B;B++)z=B<p.length?p[B]:q[B-p.length],w=z.attributes.placeholder,w?(w=w.nodeValue,w&&T.inArray(C,z.type)&&(z.getAttribute(L)||o(z),(w!==z.getAttribute(H)||"password"===z.type&&!z.getAttribute(J))&&("password"===z.type&&!z.getAttribute(J)&&T.changeType(z,"text")&&z.setAttribute(J,"password"),z.value===z.getAttribute(H)&&(z.value=w),z.setAttribute(H,w)))):z.getAttribute(I)&&(d(z),z.removeAttribute(H));s||clearInterval(x)},100)}T.addEventListener(a,"beforeunload",function(){g()}),S.disable=S.nativeSupport?b:g,S.enable=S.nativeSupport?b:h}(this),c.exports=Placeholders;try{delete window.Placeholders}catch(d){window.Placeholders=null}}),define("gallery/placeholders/3.0.1/utils",[],function(){!function(a){"use strict";function b(a,b,c){return a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):void 0}function c(a,b){var c,d;for(c=0,d=a.length;d>c;c++)if(a[c]===b)return!0;return!1}function d(a,b){var c;a.createTextRange?(c=a.createTextRange(),c.move("character",b),c.select()):a.selectionStart&&(a.focus(),a.setSelectionRange(b,b))}function e(a,b){try{return a.type=b,!0}catch(c){return!1}}a.Placeholders={Utils:{addEventListener:b,inArray:c,moveCaret:d,changeType:e}}}(this)});
diff --git a/placeholders/package.json b/placeholders/package.json
index b1f01a0..c516cd6 100644
--- a/placeholders/package.json
+++ b/placeholders/package.json
@@ -1,7 +1,7 @@
 {
   "family": "gallery",
   "name": "placeholders",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "author": "James Allardice <admin@jamesallardice.com>",
   "description": "A JavaScript polyfill for the HTML5 placeholder attribute",
   "homepage": "http://jamesallardice.github.io/Placeholders.js/",