diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 00000000..bc5c9582
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,3 @@
+ratings:
+   paths:
+   - "lib/*"
diff --git a/.travis.yml b/.travis.yml
index a3e8c00f..b8629eb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: node_js
 node_js:
 - '0.10'
 - '0.12'
-- '4.0'
-- '4.1'
+- '4.4'
+- 'stable'
 script: npm run $COMMAND
 sudo: false
 env:
diff --git a/Gruntfile.js b/Gruntfile.js
index 59364b79..4067fc2c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,32 +4,52 @@ module.exports = function(grunt) {
       browserName: "iphone",
       platform: "OS X 10.8",
       version: "6"
+  }, {
+      browserName: "iphone",
+      platform: "OS X 10.10",
+      version: "9.2"
   }, {
       browserName: "android",
       platform: "Linux",
       version: "4.0"
+  }, {
+      browserName: "android",
+      platform: "Linux",
+      version: "4.4"
+  }, {
+      browserName: "android",
+      platform: "Linux",
+      version: "5.1"
   }, {
       browserName: "firefox",
-      platform: "XP"
+      platform: "Windows 10"
   }, {
       browserName: "chrome",
-      platform: "XP"
+      platform: "Windows 10"
   }, {
       browserName: "internet explorer",
-      platform: "WIN8",
-      version: "10"
+      platform: "XP",
+      version: "7"
   }, {
       browserName: "internet explorer",
-      platform: "VISTA",
-      version: "9"
+      platform: "Windows 7",
+      version: "8"
   }, {
       browserName: "internet explorer",
       platform: "Windows 7",
-      version: "8"
+      version: "9"
   }, {
       browserName: "internet explorer",
-      platform: "XP",
-      version: "7"
+      platform: "Windows 8",
+      version: "10"
+  }, {
+      browserName: "internet explorer",
+      platform: "Windows 10",
+      version: "11"
+  }, {
+      browserName: "microsoftedge",
+      platform: "Windows 10",
+      version: "13.10586"
   }, {
       browserName: "opera",
       platform: "Windows 2008",
@@ -38,6 +58,18 @@ module.exports = function(grunt) {
       browserName: "safari",
       platform: "OS X 10.8",
       version: "6"
+  }, {
+      browserName: "safari",
+      platform: "OS X 10.9",
+      version: "7"
+  }, {
+      browserName: "safari",
+      platform: "OS X 10.10",
+      version: "8"
+  }, {
+      browserName: "safari",
+      platform: "OS X 10.11",
+      version: "9"
   }];
 
   var tags = [];
diff --git a/README.markdown b/README.markdown
index 5cfa5dd7..1f341544 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,6 +1,8 @@
-JSZip
+JSZip [![Build Status](https://api.travis-ci.org/Stuk/jszip.svg?branch=master)](http://travis-ci.org/Stuk/jszip) [![Code Climate](https://codeclimate.com/github/Stuk/jszip/badges/gpa.svg)](https://codeclimate.com/github/Stuk/jszip)
 =====
 
+[![Selenium Test Status](https://saucelabs.com/browser-matrix/jszip.svg)](https://saucelabs.com/u/jszip)
+
 A library for creating, reading and editing .zip files with Javascript, with a
 lovely and simple API.
 
@@ -26,14 +28,6 @@ images/
     smile.gif
 */
 ```
-
-Test status
------------
-
-[![Build Status](https://api.travis-ci.org/Stuk/jszip.svg?branch=master)](http://travis-ci.org/Stuk/jszip)
-
-[![Selenium Test Status](https://saucelabs.com/browser-matrix/jszip.svg)](https://saucelabs.com/u/jszip)
-
 License
 -------