diff --git a/ide_plugins/vs/coati_plugin_vs_2012.vsix b/ide_plugins/vs/coati_plugin_vs_2012.vsix
index ed5f0212..12fd2e33 100644
Binary files a/ide_plugins/vs/coati_plugin_vs_2012.vsix and b/ide_plugins/vs/coati_plugin_vs_2012.vsix differ
diff --git a/ide_plugins/vs/coati_plugin_vs_2013.vsix b/ide_plugins/vs/coati_plugin_vs_2013.vsix
index be774545..7b54b979 100644
Binary files a/ide_plugins/vs/coati_plugin_vs_2013.vsix and b/ide_plugins/vs/coati_plugin_vs_2013.vsix differ
diff --git a/ide_plugins/vs/coati_plugin_vs_2015.vsix b/ide_plugins/vs/coati_plugin_vs_2015.vsix
index 32c1017e..77b03b12 100644
Binary files a/ide_plugins/vs/coati_plugin_vs_2015.vsix and b/ide_plugins/vs/coati_plugin_vs_2015.vsix differ
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo
index adb8d25f..5aea8f32 100644
Binary files a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo and b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo differ
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct
index eb90937f..d17da920 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct
+++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct
@@ -56,6 +56,7 @@
         </Strings>
       </Button>
 
+      <!--
       <Button guid="guidCoatiPluginCmdSet" id="cmdidCoatiCreateProject" priority="0x0100" type="Button">
         <Parent guid="guidCoatiPluginCmdSet" id="MyMenuGroup" />
         <Icon guid="icon" id="icon0" />
@@ -63,6 +64,7 @@
           <ButtonText>Create Coati Project</ButtonText>
         </Strings>
       </Button>
+      -->
 
       <Button guid="guidCoatiPluginCmdSet" id="cmdidCoatiCreateProject" priority="0x0100" type="Button">
         <Parent guid="guidCoatiPluginCmdSet" id="SubMenu" />
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
index e69d2d36..3c3248e3 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
+++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="acf15780-03b5-440e-a41e-db79b7043fc2" Version="0.4.1" Language="en-US" Publisher="Coati Software" />
+    <Identity Id="acf15780-03b5-440e-a41e-db79b7043fc2" Version="0.5.0" Language="en-US" Publisher="Coati Software OG" />
     <DisplayName>CoatiPlugin</DisplayName>
-    <Description xml:space="preserve">This package allows Coati to communicate with Visual Studio and vice versa.</Description>
+    <Description xml:space="preserve">This package allows Coati to communicate with Visual Studio and vice versa.
+More infos at www.coati.io</Description>
     <Icon>coati.ico</Icon>
   </Metadata>
   <Installation InstalledByMsi="false">
diff --git a/src/lib/utility/solution/SolutionParserVisualStudio.cpp b/src/lib/utility/solution/SolutionParserVisualStudio.cpp
index c26eb27d..0f3dd782 100644
--- a/src/lib/utility/solution/SolutionParserVisualStudio.cpp
+++ b/src/lib/utility/solution/SolutionParserVisualStudio.cpp
@@ -147,6 +147,7 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
 		}
 
 		TiXmlElement* root = getFirstTagByNameWithAttribute(doc.RootElement(), "ClCompile", "Include");
+		TiXmlElement* headerRoot = getFirstTagByNameWithAttribute(doc.RootElement(), "ClInclude", "Include");
 		if (root != NULL)
 		{
 			// std::string text(root->GetText());
@@ -157,7 +158,7 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
 				text = root->Attribute("Include");
 			}
 
-			if (text.find(".cpp") == std::string::npos)
+			if (text.find(".cpp") == std::string::npos && text.find(".c") == std::string::npos)
 			{
 				root = NULL;
 			}
@@ -167,7 +168,26 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
 			}
 		}
 
-		if (root == NULL)
+		if (headerRoot != NULL)
+		{
+			std::string tag = headerRoot->Value();
+			std::string text = "";
+			if (headerRoot->Attribute("Include") != NULL)
+			{
+				text = headerRoot->Attribute("Include");
+			}
+
+			if (text.find(".h") == std::string::npos && text.find(".hpp") == std::string::npos)
+			{
+				headerRoot = NULL;
+			}
+			else
+			{
+				headerRoot = headerRoot->Parent()->ToElement();
+			}
+		}
+
+		/*if (root == NULL)
 		{
 			TiXmlElement* root = getFirstTagByNameWithAttribute(doc.RootElement(), "ClInclude", "Include");
 			if (root != NULL)
@@ -178,7 +198,9 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
 			{
 				root = NULL;
 			}
-		}
+		}*/
+
+
 
 		if (root != NULL)
 		{
@@ -197,6 +219,24 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
 				}
 			}
 		}
+
+		if (headerRoot != NULL)
+		{
+			for (TiXmlElement* child = headerRoot->FirstChildElement(); child != NULL; child = child->NextSiblingElement())
+			{
+				std::string filePath = child->Attribute("Include");
+
+				if (relativeProjectPaths[i].size() > 0)
+				{
+					filePath = relativeProjectPaths[i] + "/" + filePath;
+				}
+
+				if (checkValidFileExtension(filePath, validFileExtensions))
+				{
+					projectItems.push_back(filePath);
+				}
+			}
+		}
 	}
 
 	std::set<std::string> s(projectItems.begin(), projectItems.end());