diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..ec53b72
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,7 @@
+---
+BasedOnStyle: Google
+IndentWidth: 2
+---
+Language: Cpp
+ColumnLimit: 100
+---
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..54ad61e
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..79ee123 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/example_common b/example_common
index a9fe6f9..c2a9db8 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit a9fe6f92beb6df439f7e3cd6047507ff110e5d4a
+Subproject commit c2a9db8ac8f7d8a153673a1c4d74a8d56922b56b
diff --git a/fsfw b/fsfw
index fea301b..5425360 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit fea301bcc99ad62d0c4a0dbb8c4387ce1b8ee860
+Subproject commit 542536087637e94438f6b1b34b02ab4eb5c36021