diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..c2cdfb8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9e2f02b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+bower_components
+
+#other
+.idea
diff --git a/package.json b/package.json
index 779a629..a7f9667 100644
--- a/package.json
+++ b/package.json
@@ -17,13 +17,20 @@
     "type": "git",
     "url": "https://github.com/arastu/iran-administrative-divisions.git"
   },
+  "keywords": [
+    "iran",
+    "administrative divisions",
+    "countries",
+    "world",
+    "json",
+    "xml",
+    "persian",
+    "farsi"
+  ],
   "author": "Touhid Arastu <touhid.arastu@gmail.com> (http://arastu.ir/)",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/arastu/iran-administrative-divisions-json/issues"
   },
-  "homepage": "https://github.com/arastu/iran-administrative-divisions-json#readme",
-  "keywords": {
-    "iran","administrative-divisions","countries","world","json","xml","persian","farsi"
-  }
+  "homepage": "https://github.com/arastu/iran-administrative-divisions-json#readme"
 }