diff --git a/package.json b/package.json
index 6151a3a3..bac044d7 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
     "clean": "rimraf lib",
     "build": "babel src --out-dir lib",
     "lint": "eslint src test examples",
-    "test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
-    "test:watch": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive --watch",
+    "test": "cross-env NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
+    "test:watch": "cross-env NODE_ENV=test mocha --compilers js:babel-core/register --recursive --watch",
     "test:cov": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha -- --recursive",
     "prepublish": "npm run lint && npm run test && npm run clean && npm run build"
   },
@@ -42,6 +42,7 @@
     "babel-preset-es2015-loose": "^6.1.3",
     "babel-preset-react": "6.3.13",
     "babel-preset-stage-0": "^6.3.13",
+    "cross-env": "3.1.3",
     "eslint": "^0.23",
     "eslint-config-airbnb": "0.0.6",
     "eslint-plugin-react": "^2.3.0",
diff --git a/redux-devtools b/redux-devtools
new file mode 160000
index 00000000..2d91c712
--- /dev/null
+++ b/redux-devtools
@@ -0,0 +1 @@
+Subproject commit 2d91c7125e25c5038c634836b44644f7741270c1