diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..9b81e67
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,11 @@
+---
+BasedOnStyle: Google
+IndentWidth: 4
+---
+Language: Cpp
+ColumnLimit: 120
+CompactNamespaces: false
+AlignAfterOpenBracket: Align
+AccessModifierOffset: -2
+BinPackArguments: false
+BinPackParameters: false
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fecde20..f4ec8db 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update \
     && apt-get -y install git openssh-client vim iproute2 procps lsb-release \
     #
     # Install C++ tools
-    && apt-get -y install build-essential cmake cppcheck valgrind \
+    && apt-get -y install build-essential cmake cppcheck valgrind clang-format \
     #
     # temporary addition of the rosserial install to verify items
     && apt-get install -y ros-melodic-rosserial \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7e3fc8d..3c21048 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,6 +29,7 @@
 	"extensions": [
 		"ms-vscode.cpptools",
 		"ms-iot.vscode-ros",
-		"ms-azuretools.vscode-docker"
+		"ms-azuretools.vscode-docker",
+		"xaver.clang-format"
 	]
 }
\ No newline at end of file