diff --git a/format.js b/format.js
new file mode 100644
index 0000000..5435059
--- /dev/null
+++ b/format.js
@@ -0,0 +1,33 @@
+var jsb = require('node-js-beautify');
+var _ = require('./site/js/underscore');
+var when = require('when');
+var fs = require('fs');
+
+var arguments = process.argv.splice(2);
+
+var files = arguments;
+console.log(files);
+
+function formatFile(file) {
+    var def = when.defer();
+
+    console.log("Formatting", file);
+    fs.readFile(file, 'UTF-8', function(err, data) {
+        if (err) def.reject(err);
+        var r = new jsb().beautify_js(data, {
+            'indent_size': 4,
+            'indent_char': ' '
+        });
+        fs.writeFile(file, r, function(err) {
+            if (err) def.reject(err);
+            def.resolve("File '" + file + "' reformatted");
+        });
+    });
+    return def.promise;
+}
+
+when.all(_.map(files, formatFile)).then(function(res) {
+    _.each(res, function(item) {
+        console.log(item);
+    });
+});
\ No newline at end of file
diff --git a/package.json b/package.json
index d1ed2c7..d76e717 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "webdriverjs": "~0.6.9",
     "soda": "~0.2.5",
     "when": "~1.4.2",
-    "request": "~2.11.0"
+    "request": "~2.11.0",
+    "node-js-beautify": "~0.1.0"
   },
   "repository": {
     "type": "git",