diff --git a/README.md b/README.md
index 10692938..3266afac 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,23 @@ folder in your web browser. There should be a green bar at the top, meaning all
 tests have passed. If the bar is red, some tests have not passed. These will be
 highlighted and become visible when scrolling down.
 
-You can also run the unit tests through Gulp.js on the command line:
+If you are testing on Chrome, some of the tests will fail due to the browser's
+CORS restrictions. In order to run the browser based tests on Chrome, you need
+to run a local web-server through Gulp.js. The following command will handle it
+for you, and will also open the browser at the right address straight away:
+
+    gulp test:browser
+
+You can also run the unit tests through PhantomJS in Gulp directly on the
+command line:
+
+    gulp test:phantom
+
+To test the Node.js version of Paper.js, use this command:
+
+    gulp test:node
+
+And to test both the PhantomJS and Node.js environments together, simply run:
 
     gulp test
 
diff --git a/dist/docs/assets/js/paper.js b/dist/docs/assets/js/paper.js
index 32ca0cf9..ed5c52d4 100644
--- a/dist/docs/assets/js/paper.js
+++ b/dist/docs/assets/js/paper.js
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Wed Feb 10 18:23:56 2016 +0100
+ * Date: Thu Feb 11 10:05:21 2016 +0100
  *
  ***
  *
diff --git a/dist/paper-core.js b/dist/paper-core.js
index fae8c554..279b6b56 100644
--- a/dist/paper-core.js
+++ b/dist/paper-core.js
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Wed Feb 10 18:23:56 2016 +0100
+ * Date: Thu Feb 11 10:05:21 2016 +0100
  *
  ***
  *
diff --git a/dist/paper-core.min.js b/dist/paper-core.min.js
index 9e8ac5a6..ed980826 100644
--- a/dist/paper-core.min.js
+++ b/dist/paper-core.min.js
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Wed Feb 10 18:23:56 2016 +0100
+ * Date: Thu Feb 11 10:05:21 2016 +0100
  *
  ***
  *
diff --git a/dist/paper-full.js b/dist/paper-full.js
index 32ca0cf9..ed5c52d4 100644
--- a/dist/paper-full.js
+++ b/dist/paper-full.js
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Wed Feb 10 18:23:56 2016 +0100
+ * Date: Thu Feb 11 10:05:21 2016 +0100
  *
  ***
  *
diff --git a/dist/paper-full.min.js b/dist/paper-full.min.js
index 60b30705..d7c8cc2d 100644
--- a/dist/paper-full.min.js
+++ b/dist/paper-full.min.js
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Wed Feb 10 18:23:56 2016 +0100
+ * Date: Thu Feb 11 10:05:21 2016 +0100
  *
  ***
  *
diff --git a/package.json b/package.json
index c15e4352..88cd21bc 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "gulp-uglify": "^1.5.1",
     "gulp-uncomment": "^0.3.0",
     "gulp-util": "^3.0.0",
+    "gulp-webserver": "^0.9.1",
     "gulp-whitespace": "^0.1.0",
     "gulp-zip": "^3.0.2",
     "jshint": "2.8.x",