diff --git a/index.html b/index.html
index b754c329..0cde76c1 100644
--- a/index.html
+++ b/index.html
@@ -33,9 +33,9 @@
 <input type="button" id="dotext" value="Click here to process the base64 text" onclick="b64it();"/>
 <pre id="out"></pre>
 <br />
+<script src="shim.js"></script>
 <script src="jszip.js"></script>
 <script src="xlsx.js"></script>
-<script src="shim.js"></script>
 <script>
 var rABS = typeof FileReader !== "undefined" && typeof FileReader.prototype !== "undefined" && typeof FileReader.prototype.readAsBinaryString !== "undefined";
 function fixdata(data) {
diff --git a/shim.js b/shim.js
index e3569da6..0158595a 100644
--- a/shim.js
+++ b/shim.js
@@ -1,3 +1,4 @@
+// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
 if (!Object.keys) {
   Object.keys = (function () {
     var hasOwnProperty = Object.prototype.hasOwnProperty,
@@ -32,6 +33,7 @@ if (!Object.keys) {
   })();
 }
 
+// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter
 if (!Array.prototype.filter)
 {
   Array.prototype.filter = function(fun /*, thisp */)
@@ -62,10 +64,33 @@ if (!Array.prototype.filter)
   };
 }
 
-if ( !Array.prototype.forEach ) {
-  Array.prototype.forEach = function(fn, scope) {
-    for(var i = 0, len = this.length; i < len; ++i) {
-      fn.call(scope, this[i], i, this);
+// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim
+if (!String.prototype.trim) {
+  String.prototype.trim = function () {
+    return this.replace(/^\s+|\s+$/g, '');
+  };
+}
+
+// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach
+if (!Array.prototype.forEach)
+{
+  Array.prototype.forEach = function(fun /*, thisArg */)
+  {
+    "use strict";
+
+    if (this === void 0 || this === null)
+      throw new TypeError();
+
+    var t = Object(this);
+    var len = t.length >>> 0;
+    if (typeof fun !== "function")
+      throw new TypeError();
+
+    var thisArg = arguments.length >= 2 ? arguments[1] : void 0;
+    for (var i = 0; i < len; i++)
+    {
+      if (i in t)
+        fun.call(thisArg, t[i], i, t);
     }
   };
 }
@@ -144,13 +169,46 @@ if (!Array.prototype.map) {
   };      
 }
 
+// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+  Array.prototype.indexOf = function (searchElement, fromIndex) {
+    if ( this === undefined || this === null ) {
+      throw new TypeError( '"this" is null or not defined' );
+    }
+
+    var length = this.length >>> 0; // Hack to convert object.length to a UInt32
+
+    fromIndex = +fromIndex || 0;
+
+    if (Math.abs(fromIndex) === Infinity) {
+      fromIndex = 0;
+    }
+
+    if (fromIndex < 0) {
+      fromIndex += length;
+      if (fromIndex < 0) {
+        fromIndex = 0;
+      }
+    }
+
+    for (;fromIndex < length; fromIndex++) {
+      if (this[fromIndex] === searchElement) {
+        return fromIndex;
+      }
+    }
+
+    return -1;
+  };
+}
+
+
 // https://github.com/ttaubert/node-arraybuffer-slice
 // (c) 2013 Tim Taubert <tim@timtaubert.de>
 // arraybuffer-slice may be freely distributed under the MIT license.
 
 "use strict";
 
-if (!ArrayBuffer.prototype.slice) {
+if (typeof ArrayBuffer !== 'undefined' && !ArrayBuffer.prototype.slice) {
   ArrayBuffer.prototype.slice = function (begin, end) {
     begin = (begin|0) || 0;
     var num = this.byteLength;
diff --git a/xlsx.js b/xlsx.js
index bf4d9a21..dd26f89a 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -886,7 +886,7 @@ function parse_FontFlags(data, length) {
 		fOutline: d & 0x10,
 		fShadow: d & 0x20,
 		fCondense: d & 0x40,
-		fExtend: d & 0x80,
+		fExtend: d & 0x80
 	};
 	return out;
 }