diff --git a/.editorconfig b/.editorconfig
index 158d9c5..7382bb8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
 root = true
 
 [*]
-end_of_line = lf
-indent_style = space
-indent_space = 4
 charset = utf-8
-trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space
+end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2
diff --git a/.gitignore b/.gitignore
index 63437a5..cec535c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .vscode/
+.idea/
 build/
 vendor/
 composer.lock