diff --git a/.clang-tidy b/.clang-tidy
index c971f37156c74e6e91f0e6e7a99037364664aa2d..ef96a91778252d52842b7a7059d92482b88b9e27 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,16 +1,19 @@
-Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-const-correctness,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,readability-identifier-naming'
+Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-const-correctness,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,readability-identifier-naming,readability-braces-around-statements'
 CheckOptions:
   - key:             readability-identifier-naming.ClassCase
     value:           CamelCase
   - key:             readability-identifier-naming.EnumCase
     value:           CamelCase
+  - key:             readability-identifier-naming.UnionCase
+    value:           CamelCase
+# Within ASTRON no specific casing is used. We suggest to use
+# these settings, but feel free to adjust  following casings
+# for existing projects or personal/team preferences.
   - key:             readability-identifier-naming.FunctionCase
-    value:           camelBack
-  - key:             readability-identifier-naming.MemberCase
     value:           CamelCase
+  - key:             readability-identifier-naming.MemberCase
+    value:           lower_case
   - key:             readability-identifier-naming.ParameterCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.UnionCase
-    value:           CamelCase
+    value:           lower_case
   - key:             readability-identifier-naming.VariableCase
-    value:           CamelCase
+    value:           lower_case
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..580df8c8694c6c71b406b279f0c39446476eb61c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+[{CMakeLists.txt,*.cmake,*.rst}]
+indent_size = 2
+indent_style = space
diff --git a/.gitignore b/.gitignore
index 6f31401f787928dc3bb3e2622578f889336d1d92..a6a214ad95e6f0e472318f4060204b2527911217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 build/
 .vscode/
+
+cmake-build-debug/
+.idea/