diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c2658d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/package.json b/package.json
index d25a2a1..a098b3b 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,12 @@
     "Faisal Salman <fyzlman@gmail.com>"
   ],
   "main": "ua-parser",
+  "scripts": {
+    "test": "./node_modules/mocha/bin/mocha"
+  },
+  "devDependencies": {
+    "mocha": ">= 1.7.1"
+  },
   "repositories": [
     {
       "type": "git",
diff --git a/test.js b/test.js
new file mode 100644
index 0000000..18c72f9
--- /dev/null
+++ b/test.js
@@ -0,0 +1,10 @@
+var assert = require("assert");
+var UAParser = require("./ua-parser");
+
+describe('getDevice', function () {
+  it('should return the model', function () {
+    var parser = new UAParser('Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11');
+    var device = parser.getDevice();
+    assert.equal(device.model, "PlayBook");
+  });
+});
diff --git a/ua-parser.js b/ua-parser.js
index 8347679..153344c 100644
--- a/ua-parser.js
+++ b/ua-parser.js
@@ -358,7 +358,7 @@
     };
 
     // check whether script is running inside node.js export as module
-    if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') {
+    if (typeof exports !== 'undefined' && (!this || this.toString() !== '[object DOMWindow]')) {
         if (typeof module !== 'undefined' && module.exports) {
             exports = module.exports = UAParser;
         }