diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..412eeda7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/README.md b/README.md
index 55bff2a0..731abebc 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
-qgis-crayfish-plugin
-====================
-
-The Crayfish Plugin for QGIS aspires to be a complete set of pre and post-processing tools for hydraulic modellers using TUFLOW and other packages.
-
-Todo
-====
-
-Prepare a resources page (essentially a manual)
-Fix About section
-Add support for downloading Crayfish Viewer library from behind proxy server
-Anti-aliasing
-Consider removing apply button as it seems redundant
-Implement full sanity checking of user input values in Vector properties dialog and suitable error mesages
-Implement display vectors on arbitrary grid
-Implement filter vectors by magnitude
+qgis-crayfish-plugin
+====================
+
+The Crayfish Plugin for QGIS aspires to be a complete set of pre and post-processing tools for hydraulic modellers using TUFLOW and other packages.
+
+Todo
+====
+
+Prepare a resources page (essentially a manual)
+Fix About section
+Add support for downloading Crayfish Viewer library from behind proxy server
+Anti-aliasing
+Consider removing apply button as it seems redundant
+Implement full sanity checking of user input values in Vector properties dialog and suitable error mesages
+Implement display vectors on arbitrary grid
+Implement filter vectors by magnitude