diff --git a/dtsm.json b/dtsm.json
index ccba153..3d7c85f 100644
--- a/dtsm.json
+++ b/dtsm.json
@@ -14,16 +14,16 @@
   },
   "dependencies": {
     "node/node.d.ts": {
-      "ref": "6f04d25ad38982d372cc3cda62fa4c0eef9e24d7"
+      "ref": "7c27233ae47768442b9b0a40d7f03fadf593fad2"
     },
     "es6-promise/es6-promise.d.ts": {
-      "ref": "6f04d25ad38982d372cc3cda62fa4c0eef9e24d7"
+      "ref": "7c27233ae47768442b9b0a40d7f03fadf593fad2"
     },
     "mocha/mocha.d.ts": {
-      "ref": "6f04d25ad38982d372cc3cda62fa4c0eef9e24d7"
+      "ref": "7c27233ae47768442b9b0a40d7f03fadf593fad2"
     },
     "power-assert/power-assert.d.ts": {
-      "ref": "6f04d25ad38982d372cc3cda62fa4c0eef9e24d7"
+      "ref": "7c27233ae47768442b9b0a40d7f03fadf593fad2"
     }
   }
 }
diff --git a/lib/cli.ts b/lib/cli.ts
index 78b3bbb..526ced2 100644
--- a/lib/cli.ts
+++ b/lib/cli.ts
@@ -102,14 +102,14 @@ function showResultHandler(resultMap: lib.ResultMap): Promise<any> {
         Object.keys(resultMap)
             .map(fileName => resultMap[fileName])
             .filter(result => result.error)
-            .forEach(result => console.error(result.message));
+            .forEach(result => process.stderr.write(result.message));
         process.exit(1);
     } else {
         Object.keys(resultMap)
             .map(fileName => resultMap[fileName])
             .forEach(result => {
                 if (result.message) {
-                    console.log(result.message);
+                    process.stdout.write(result.message.replace(/^\s+$/mg, "").replace(/\n\n^$/mg, ""));
                 }
             });
     }
diff --git a/lib/formatter.ts b/lib/formatter.ts
index c973046..91e15cd 100644
--- a/lib/formatter.ts
+++ b/lib/formatter.ts
@@ -7,11 +7,11 @@ import utils = require("./utils");
 
 // Note: this uses ts.formatting which is part of the typescript 1.4 package but is not currently
 //       exposed in the public typescript.d.ts. The typings should be exposed in the next release.
-function format(text: string, options = utils.createDefaultFormatCodeOptions()) {
+function format(fileName: string, text: string, options = utils.createDefaultFormatCodeOptions()) {
     "use strict";
 
     // Parse the source text
-    var sourceFile = ts.createSourceFile("file.ts", text, ts.ScriptTarget.Latest, (<any>/* backward compat for typescript-1.4.1 */"0"));
+    var sourceFile = ts.createSourceFile(fileName, text, ts.ScriptTarget.Latest, (<any>/* backward compat for typescript-1.4.1 */"0"));
     fixupParentReferences(sourceFile);
 
     // Get the formatting edits on the input sources
diff --git a/lib/index.ts b/lib/index.ts
index 9c5ee0b..bb1e81c 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -1,6 +1,6 @@
 /// <reference path="../typings/node/node.d.ts" />
-/// <reference path="../node_modules/typescript/bin/typescript.d.ts" />
-/// <reference path="../node_modules/typescript/bin/lib.es6.d.ts" />
+/// <reference path="../node_modules/typescript/lib/typescript.d.ts" />
+/// <reference path="../node_modules/typescript/lib/lib.es6.d.ts" />
 
 "use strict";
 
@@ -46,7 +46,7 @@ export function processFiles(files: string[], opts: Options): Promise<ResultMap>
             var result: Result = {
                 fileName: fileName,
                 options: null,
-                message: `${fileName} is not exists. process abort.`,
+                message: `${fileName} is not exists. process abort.\n`,
                 error: true,
                 src: "",
                 dest: ""
@@ -101,7 +101,7 @@ export function processString(fileName: string, content: string, opts: Options):
     return Promise
         .all(optGenPromises)
         .then(() => {
-            var formattedCode = formatter(content, options);
+            var formattedCode = formatter(fileName, content, options);
             if ((<any>formattedCode).trimRight) {
                 formattedCode = (<any>formattedCode).trimRight();
                 formattedCode += "\n";
@@ -112,13 +112,13 @@ export function processString(fileName: string, content: string, opts: Options):
             var error = false;
             if (opts && opts.verify) {
                 if (content !== formattedCode) {
-                    message = `${fileName} is not formatted`;
+                    message = `${fileName} is not formatted\n`;
                     error = true;
                 }
             } else if (opts && opts.replace) {
                 if (content !== formattedCode) {
                     fs.writeFileSync(fileName, formattedCode);
-                    message = `replaced ${fileName}`;
+                    message = `replaced ${fileName}\n`;
                 }
             } else if (opts && !opts.dryRun) {
                 message = formattedCode;
diff --git a/lib/provider/tslintjson.ts b/lib/provider/tslintjson.ts
index b2f017d..de53904 100644
--- a/lib/provider/tslintjson.ts
+++ b/lib/provider/tslintjson.ts
@@ -23,10 +23,6 @@ function getConfigFileName(baseFileName: string, configFileName: string): string
 
 interface TslintSettings {
     rules: {
-        indent: {
-            0: boolean;
-            1: number;
-        };
         whitespace: {
             0: boolean;
             1: string;
@@ -53,9 +49,6 @@ export function makeFormatCodeOptions(fileName: string, options: ts.FormatCodeOp
     if (!config.rules) {
         return options;
     }
-    if (config.rules.indent && config.rules.indent[0]) {
-        options.IndentSize = config.rules.indent[1];
-    }
     if (config.rules.whitespace && config.rules.whitespace[0]) {
         for (var p in config.rules.whitespace) {
             var value = config.rules.whitespace[p];
diff --git a/lib/utils.ts b/lib/utils.ts
index 83cf61c..e0a792d 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -16,6 +16,7 @@ export function createDefaultFormatCodeOptions(): ts.FormatCodeOptions {
         InsertSpaceAfterKeywordsInControlFlowStatements: true,
         InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
         InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+		  InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
         PlaceOpenBraceOnNewLineForFunctions: false,
         PlaceOpenBraceOnNewLineForControlBlocks: false
     };
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1fd6988..649ccf3 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,56 +1,56 @@
 {
   "name": "typescript-formatter",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "dependencies": {
     "commandpost": {
       "version": "0.1.1",
-      "from": "commandpost@0.1.1",
+      "from": "https://registry.npmjs.org/commandpost/-/commandpost-0.1.1.tgz",
       "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-0.1.1.tgz",
       "dependencies": {
         "es6-promise": {
           "version": "2.0.1",
-          "from": "es6-promise@2.0.1",
+          "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.0.1.tgz",
           "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.0.1.tgz"
         }
       }
     },
     "editorconfig": {
       "version": "0.12.2",
-      "from": "editorconfig@0.12.2",
+      "from": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.12.2.tgz",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.12.2.tgz",
       "dependencies": {
         "bluebird": {
           "version": "2.9.34",
-          "from": "bluebird@>=2.3.6 <3.0.0",
+          "from": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz",
           "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"
         },
         "commander": {
           "version": "1.1.1",
-          "from": "commander@>=1.1.1 <1.2.0",
+          "from": "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz",
           "dependencies": {
             "keypress": {
               "version": "0.1.0",
-              "from": "keypress@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"
             }
           }
         },
         "lru-cache": {
           "version": "2.0.4",
-          "from": "lru-cache@>=2.0.0 <2.1.0",
+          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.0.4.tgz",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.0.4.tgz"
         },
         "sigmund": {
           "version": "1.0.1",
-          "from": "sigmund@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
         }
       }
     },
     "es6-promise": {
       "version": "2.3.0",
-      "from": "es6-promise@2.3.0",
+      "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"
     },
     "espower-loader": {
@@ -239,9 +239,9 @@
           }
         },
         "minimatch": {
-          "version": "2.0.9",
+          "version": "2.0.10",
           "from": "minimatch@>=2.0.4 <2.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
           "dependencies": {
             "brace-expansion": {
               "version": "1.1.0",
@@ -412,7 +412,7 @@
         },
         "rimraf": {
           "version": "2.2.8",
-          "from": "rimraf@>=2.2.8 <2.3.0",
+          "from": "rimraf@>=2.2.1 <2.3.0",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
         },
         "lodash": {
@@ -957,9 +957,9 @@
                   "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                   "dependencies": {
                     "camelcase": {
-                      "version": "1.1.0",
+                      "version": "1.2.1",
                       "from": "camelcase@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                     },
                     "map-obj": {
                       "version": "1.0.1",
@@ -1000,9 +1000,9 @@
                   }
                 },
                 "minimist": {
-                  "version": "1.1.1",
+                  "version": "1.1.2",
                   "from": "minimist@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
                 },
                 "object-assign": {
                   "version": "3.0.0",
@@ -1146,9 +1146,9 @@
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
-                  "version": "2.0.9",
+                  "version": "2.0.10",
                   "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                   "dependencies": {
                     "brace-expansion": {
                       "version": "1.1.0",
@@ -1202,10 +1202,12 @@
     "grunt-dtsm": {
       "version": "0.2.9",
       "from": "grunt-dtsm@0.2.9",
+      "resolved": "https://registry.npmjs.org/grunt-dtsm/-/grunt-dtsm-0.2.9.tgz",
       "dependencies": {
         "dtsm": {
           "version": "0.10.3",
           "from": "dtsm@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/dtsm/-/dtsm-0.10.3.tgz",
           "dependencies": {
             "archy": {
               "version": "1.0.0",
@@ -1304,9 +1306,9 @@
                       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
                       "dependencies": {
                         "os-homedir": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "os-homedir@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
                         }
                       }
                     },
@@ -1316,9 +1318,9 @@
                       "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
                       "dependencies": {
                         "os-homedir": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "os-homedir@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
                         }
                       }
                     },
@@ -1333,9 +1335,9 @@
                       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
                       "dependencies": {
                         "os-homedir": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "os-homedir@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
                         }
                       }
                     }
@@ -1423,9 +1425,9 @@
                       "resolved": "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz",
                       "dependencies": {
                         "minimist": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "minimist@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
                         }
                       }
                     },
@@ -1437,9 +1439,9 @@
                   }
                 },
                 "request": {
-                  "version": "2.59.0",
+                  "version": "2.60.0",
                   "from": "request@>=2.40.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.59.0.tgz",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.60.0.tgz",
                   "dependencies": {
                     "bl": {
                       "version": "1.0.0",
@@ -1501,13 +1503,13 @@
                       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
                     },
                     "form-data": {
-                      "version": "1.0.0-rc1",
+                      "version": "1.0.0-rc3",
                       "from": "form-data@>=1.0.0-rc1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc1.tgz",
+                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
                       "dependencies": {
                         "async": {
                           "version": "1.4.0",
-                          "from": "async@>=1.2.1 <2.0.0",
+                          "from": "async@>=1.4.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz"
                         }
                       }
@@ -1518,14 +1520,14 @@
                       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                     },
                     "mime-types": {
-                      "version": "2.1.3",
+                      "version": "2.1.4",
                       "from": "mime-types@>=2.1.2 <2.2.0",
-                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.4.tgz",
                       "dependencies": {
                         "mime-db": {
-                          "version": "1.15.0",
-                          "from": "mime-db@>=1.15.0 <1.16.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz"
+                          "version": "1.16.0",
+                          "from": "mime-db@>=1.16.0 <1.17.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.16.0.tgz"
                         }
                       }
                     },
@@ -1648,9 +1650,9 @@
                           }
                         },
                         "is-my-json-valid": {
-                          "version": "2.12.0",
+                          "version": "2.12.1",
                           "from": "is-my-json-valid@>=2.12.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.1.tgz",
                           "dependencies": {
                             "generate-function": {
                               "version": "2.0.0",
@@ -1775,9 +1777,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.9",
+                      "version": "2.0.10",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -1891,9 +1893,9 @@
                       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
                       "dependencies": {
                         "os-homedir": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "os-homedir@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
                         }
                       }
                     },
@@ -1903,9 +1905,9 @@
                       "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
                       "dependencies": {
                         "os-homedir": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "os-homedir@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
                         }
                       }
                     },
@@ -1920,9 +1922,9 @@
                       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
                       "dependencies": {
                         "os-homedir": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "os-homedir@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
                         }
                       }
                     }
@@ -2049,9 +2051,9 @@
                               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
                             },
                             "prepend-http": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "prepend-http@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.2.tgz"
                             },
                             "read-all-stream": {
                               "version": "3.0.1",
@@ -2122,14 +2124,14 @@
                           "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.0.3.tgz",
                           "dependencies": {
                             "rc": {
-                              "version": "1.0.3",
+                              "version": "1.1.0",
                               "from": "rc@>=1.0.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/rc/-/rc-1.0.3.tgz",
+                              "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.0.tgz",
                               "dependencies": {
                                 "minimist": {
-                                  "version": "0.0.10",
-                                  "from": "minimist@>=0.0.7 <0.1.0",
-                                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                                  "version": "1.1.2",
+                                  "from": "minimist@>=1.1.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
                                 },
                                 "deep-extend": {
                                   "version": "0.2.11",
@@ -2264,9 +2266,9 @@
       "resolved": "https://registry.npmjs.org/grunt-ts/-/grunt-ts-4.2.0-beta.1.tgz",
       "dependencies": {
         "chokidar": {
-          "version": "1.0.4",
+          "version": "1.0.5",
           "from": "chokidar@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.0.5.tgz",
           "dependencies": {
             "anymatch": {
               "version": "1.3.0",
@@ -2274,9 +2276,9 @@
               "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
               "dependencies": {
                 "micromatch": {
-                  "version": "2.1.6",
+                  "version": "2.2.0",
                   "from": "micromatch@>=2.1.5 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.1.6.tgz",
+                  "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.2.0.tgz",
                   "dependencies": {
                     "arr-diff": {
                       "version": "1.0.1",
@@ -2290,6 +2292,11 @@
                         }
                       }
                     },
+                    "array-unique": {
+                      "version": "0.2.1",
+                      "from": "array-unique@>=0.2.1 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
+                    },
                     "braces": {
                       "version": "1.8.0",
                       "from": "braces@>=1.8.0 <2.0.0",
@@ -2341,23 +2348,40 @@
                         }
                       }
                     },
-                    "debug": {
-                      "version": "2.2.0",
-                      "from": "debug@>=2.1.3 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                    "expand-brackets": {
+                      "version": "0.1.2",
+                      "from": "expand-brackets@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.2.tgz"
+                    },
+                    "extglob": {
+                      "version": "0.3.1",
+                      "from": "extglob@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.1.tgz",
                       "dependencies": {
-                        "ms": {
-                          "version": "0.7.1",
-                          "from": "ms@0.7.1",
-                          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                        "ansi-green": {
+                          "version": "0.1.1",
+                          "from": "ansi-green@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/ansi-green/-/ansi-green-0.1.1.tgz",
+                          "dependencies": {
+                            "ansi-wrap": {
+                              "version": "0.1.0",
+                              "from": "ansi-wrap@0.1.0",
+                              "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "is-extglob": {
+                          "version": "1.0.0",
+                          "from": "is-extglob@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+                        },
+                        "success-symbol": {
+                          "version": "0.1.0",
+                          "from": "success-symbol@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/success-symbol/-/success-symbol-0.1.0.tgz"
                         }
                       }
                     },
-                    "expand-brackets": {
-                      "version": "0.1.1",
-                      "from": "expand-brackets@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.1.tgz"
-                    },
                     "filename-regex": {
                       "version": "2.0.0",
                       "from": "filename-regex@>=2.0.0 <3.0.0",
@@ -2369,13 +2393,13 @@
                       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz"
                     },
                     "object.omit": {
-                      "version": "0.2.1",
-                      "from": "object.omit@>=0.2.1 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-0.2.1.tgz",
+                      "version": "1.1.0",
+                      "from": "object.omit@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-1.1.0.tgz",
                       "dependencies": {
                         "for-own": {
                           "version": "0.1.3",
-                          "from": "for-own@>=0.1.1 <0.2.0",
+                          "from": "for-own@>=0.1.3 <0.2.0",
                           "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz",
                           "dependencies": {
                             "for-in": {
@@ -2386,15 +2410,15 @@
                           }
                         },
                         "isobject": {
-                          "version": "0.2.0",
-                          "from": "isobject@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-0.2.0.tgz"
+                          "version": "1.0.2",
+                          "from": "isobject@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz"
                         }
                       }
                     },
                     "parse-glob": {
                       "version": "3.0.2",
-                      "from": "parse-glob@>=3.0.0 <4.0.0",
+                      "from": "parse-glob@>=3.0.1 <4.0.0",
                       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.2.tgz",
                       "dependencies": {
                         "glob-base": {
@@ -2416,7 +2440,7 @@
                     },
                     "regex-cache": {
                       "version": "0.4.2",
-                      "from": "regex-cache@>=0.4.0 <0.5.0",
+                      "from": "regex-cache@>=0.4.2 <0.5.0",
                       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
                       "dependencies": {
                         "is-equal-shallow": {
@@ -2473,14 +2497,14 @@
               "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
             },
             "readdirp": {
-              "version": "1.3.0",
+              "version": "1.4.0",
               "from": "readdirp@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.4.0.tgz",
               "dependencies": {
                 "graceful-fs": {
-                  "version": "2.0.3",
-                  "from": "graceful-fs@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                 },
                 "minimatch": {
                   "version": "0.2.14",
@@ -2527,18 +2551,6 @@
                   }
                 }
               }
-            },
-            "fsevents": {
-              "version": "0.3.6",
-              "from": "fsevents@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.6.tgz",
-              "dependencies": {
-                "nan": {
-                  "version": "1.8.4",
-                  "from": "nan@>=1.8.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
-                }
-              }
             }
           }
         },
@@ -2651,9 +2663,9 @@
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
-                  "version": "2.0.9",
+                  "version": "2.0.10",
                   "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                   "dependencies": {
                     "brace-expansion": {
                       "version": "1.1.0",
@@ -2713,9 +2725,9 @@
               }
             },
             "minimatch": {
-              "version": "2.0.9",
+              "version": "2.0.10",
               "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
@@ -2742,107 +2754,107 @@
     },
     "mocha": {
       "version": "2.2.5",
-      "from": "mocha@>=1.20.0",
+      "from": "https://registry.npmjs.org/mocha/-/mocha-2.2.5.tgz",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.2.5.tgz",
       "dependencies": {
         "commander": {
           "version": "2.3.0",
-          "from": "commander@2.3.0",
+          "from": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"
         },
         "debug": {
           "version": "2.0.0",
-          "from": "debug@2.0.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "diff": {
           "version": "1.4.0",
-          "from": "diff@1.4.0",
+          "from": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
           "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"
         },
         "escape-string-regexp": {
           "version": "1.0.2",
-          "from": "escape-string-regexp@1.0.2",
+          "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
         },
         "glob": {
           "version": "3.2.3",
-          "from": "glob@3.2.3",
+          "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
           "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
           "dependencies": {
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.11 <0.3.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.6.5",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.1",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                 }
               }
             },
             "graceful-fs": {
               "version": "2.0.3",
-              "from": "graceful-fs@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "growl": {
           "version": "1.8.1",
-          "from": "growl@1.8.1",
+          "from": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
           "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz"
         },
         "jade": {
           "version": "0.26.3",
-          "from": "jade@0.26.3",
+          "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
           "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
           "dependencies": {
             "commander": {
               "version": "0.6.1",
-              "from": "commander@0.6.1",
+              "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
               "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
             },
             "mkdirp": {
               "version": "0.3.0",
-              "from": "mkdirp@0.3.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
             }
           }
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@0.5.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "supports-color": {
           "version": "1.2.1",
-          "from": "supports-color@>=1.2.0 <1.3.0",
+          "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"
         }
       }
@@ -2888,9 +2900,9 @@
                   "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
                 },
                 "esprima": {
-                  "version": "2.4.1",
+                  "version": "2.5.0",
                   "from": "esprima@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.4.1.tgz"
+                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz"
                 },
                 "espurify": {
                   "version": "1.3.0",
@@ -3000,38 +3012,38 @@
       }
     },
     "tslint": {
-      "version": "2.3.1-beta",
-      "from": "tslint@>=2.3.1-beta <3.0.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-2.3.1-beta.tgz",
+      "version": "2.4.2",
+      "from": "https://registry.npmjs.org/tslint/-/tslint-2.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-2.4.2.tgz",
       "dependencies": {
         "findup-sync": {
           "version": "0.1.3",
-          "from": "findup-sync@>=0.1.2 <0.2.0",
+          "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
           "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
           "dependencies": {
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.9 <3.3.0",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.6.5",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                     }
                   }
@@ -3040,39 +3052,39 @@
             },
             "lodash": {
               "version": "2.4.2",
-              "from": "lodash@>=2.4.1 <2.5.0",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
             }
           }
         },
         "optimist": {
           "version": "0.6.1",
-          "from": "optimist@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "dependencies": {
             "wordwrap": {
               "version": "0.0.3",
-              "from": "wordwrap@>=0.0.2 <0.1.0",
+              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
               "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
             },
             "minimist": {
               "version": "0.0.10",
-              "from": "minimist@>=0.0.1 <0.1.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
             }
           }
         },
         "underscore.string": {
           "version": "2.3.3",
-          "from": "underscore.string@>=2.3.3 <2.4.0",
+          "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
           "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
         }
       }
     },
     "typescript": {
-      "version": "1.5.3",
-      "from": "typescript@1.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.5.3.tgz"
+      "version": "1.6.0-dev.20150909",
+      "from": "typescript@next",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.0-dev.20150909.tgz"
     }
   }
 }
diff --git a/package.json b/package.json
index 6edee94..c7ec9cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-formatter",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Formatter of TypeScript code",
   "main": "./index",
   "bin": {
@@ -34,7 +34,7 @@
     "commandpost": "0.1.1",
     "editorconfig": "0.12.2",
     "es6-promise": "2.3.0",
-    "typescript": "1.5.3"
+    "typescript": "^1.6.0-dev.20150906"
   },
   "devDependencies": {
     "espower-loader": "0.11.0",
@@ -48,6 +48,7 @@
     "grunt-ts": "4.2.0-beta.1",
     "grunt-tslint": "2.3.1-beta",
     "load-grunt-tasks": "3.2.0",
-    "power-assert": "0.11.0"
+    "power-assert": "0.11.0",
+    "typescript": "^1.6.0-dev.20150909"
   }
 }
diff --git a/typescript-formatter.d.ts b/typescript-formatter.d.ts
index 5e0037b..a733ee8 100644
--- a/typescript-formatter.d.ts
+++ b/typescript-formatter.d.ts
@@ -1,6 +1,6 @@
 // Generated by dts-bundle v0.2.0
 // Dependencies for this module:
-//   node_modules/typescript/bin/typescript.d.ts
+//   node_modules/typescript/lib/typescript.d.ts
 
 declare module 'typescript-formatter' {
     import ts = require("typescript");