diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..631185f11
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = 120
+trim_trailing_whitespace = true
diff --git a/package.json b/package.json
index cc1d135c4..57ad4d410 100644
--- a/package.json
+++ b/package.json
@@ -45,10 +45,10 @@
     "minimatch": "^3.0.0",
     "progress": "^2.0.0",
     "shelljs": "^0.7.0",
-    "typedoc-default-themes": "^0.5.0",
-    "typescript": "2.5.3"
+    "typedoc-default-themes": "^0.5.0"
   },
   "devDependencies": {
+    "typescript": "2.5.3",
     "@types/mocha": "^2.2.39",
     "grunt": "^1.0.1",
     "grunt-cli": "^1.2.0",
@@ -63,6 +63,9 @@
     "mocha": "^4.0.0",
     "tslint": "^5.1.0"
   },
+  "peerDependencies": {
+    "typescript": "2.x.x"
+  },
   "files": [
     "bin",
     "dist",