diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..638b9b9
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,39 @@
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+AllowShortBlocksOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+BasedOnStyle: LLVM
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+BreakBeforeBraces: Custom
+ColumnLimit: 0
+Cpp11BracedListStyle: false
+FixNamespaceComments: false
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+PointerAlignment: Right
+SortIncludes: false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: true
diff --git a/MicroClient.vcxproj b/MicroClient.vcxproj
index 2864d66..81d28bf 100644
--- a/MicroClient.vcxproj
+++ b/MicroClient.vcxproj
@@ -245,6 +245,7 @@
     <ClInclude Include="TParseString.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include=".clang-format" />
     <None Include="res\MicroClient.ico" />
     <None Include="res\MicroClient.rc2" />
     <None Include="res\MicroClientDoc.ico" />
diff --git a/MicroClient.vcxproj.filters b/MicroClient.vcxproj.filters
index ba964c5..7b01e0d 100644
--- a/MicroClient.vcxproj.filters
+++ b/MicroClient.vcxproj.filters
@@ -103,5 +103,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="ReadMe.txt" />
+    <None Include=".clang-format" />
   </ItemGroup>
 </Project>
\ No newline at end of file