diff --git a/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj b/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj
index 7a8d795d..64e6881b 100644
--- a/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj
+++ b/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj
@@ -525,6 +525,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_CABEFC3263394106B5E96F489B7E8D85"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -640,6 +646,12 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -769,6 +781,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_2DD762B8DECB40D69A7E3495EFDABC4E"
+            {
+            "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+            "FileType" = "3:1"
+            "InstallAction" = "3:3"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:4"
+            "Identifier" = "8:_147D9FD0_6C78_461C_AD73_82ECCAB526B2"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3822F3F8AB4C430794A666BBCCC3C6BC"
             {
             "Name" = "8:Primary output from SetupApplicationSettingsLib (Active)"
@@ -783,6 +809,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3BBF42F2D0554015BCF7349671B9EFFD"
+            {
+            "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+            "FileType" = "3:1"
+            "InstallAction" = "3:2"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:3"
+            "Identifier" = "8:_CAEF50B1_02B9_4DB1_8DC5_E4E5DB4772DE"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_463FBB946E6F4CF290A4B7E51ED398E5"
             {
             "Name" = "8:Primary output from SetupCreateDesktopShortcutLib (Active)"
@@ -811,6 +851,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_541A6531B7F740DF8DCF518908A99D36"
+            {
+            "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+            "FileType" = "3:1"
+            "InstallAction" = "3:4"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:4"
+            "Identifier" = "8:_A7EE1E7D_CFF9_47D5_9F1D_8340AF683CFA"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_67190625A6A64789B579DC9ABA4CC848"
             {
             "Name" = "8:Primary output from SetupCreateDesktopShortcutLib (Active)"
@@ -867,6 +921,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_DD799787F39A4F1A8742B6CBC1DABF17"
+            {
+            "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+            "FileType" = "3:1"
+            "InstallAction" = "3:1"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:3"
+            "Identifier" = "8:_73BFCC58_37EB_4D02_A2F8_7A0D5C37AF81"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_EA511606B8E840088DBD733FF462117D"
             {
             "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
@@ -4241,7 +4309,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3460FAB707F8431E87168499A7F51556"
             {
-            "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Debug\\SetupApplicationSettingsLib.dll"
+            "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Release\\SetupApplicationSettingsLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4267,9 +4335,37 @@
                 {
                 }
             }
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+            {
+            "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Release\\SetupCreateStartMenuShortcutLib.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{962F7DA5-AEA1-4D03-89FD-F9AC42C24E46}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F81B906E39E44A5DAC37B3D70BC8A8CE"
             {
-            "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Debug\\SetupCreateDesktopShortcutLib.dll"
+            "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Release\\SetupCreateDesktopShortcutLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4297,7 +4393,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB29EAD658C3497D9AC46ADE92D33C83"
             {
-            "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Debug\\SetupRemoveCacheFiles.dll"
+            "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Release\\SetupRemoveCacheFiles.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo
index e5c9672b..23d32bda 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.csproj b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
index 70995393..0c0df1c6 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
+++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
@@ -132,6 +132,7 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PkgCmdID.cs" />
+    <Compile Include="SolutionUtility.cs" />
     <Compile Include="SystemUtility.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs
index c69dd742..023f8a33 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs
+++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs
@@ -14,6 +14,7 @@ using System.Net.Sockets;
 using System.Net;
 using System.Text;
 using System.Threading;
+using System.Collections.Generic;
 
 using EnvDTE;
 using EnvDTE80;
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs
new file mode 100644
index 00000000..adedc713
--- /dev/null
+++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EnvDTE;
+
+namespace CoatiSoftware.CoatiPlugin
+{
+    class SolutionUtility
+    {
+        public static List<String> GetSolutionProjects(DTE dte)
+        {
+            List<String> projectNames = new List<String>();
+
+            EnvDTE.Solution solution = dte.Solution;
+            EnvDTE.Projects projects = solution.Projects;
+
+            foreach (EnvDTE.Project project in projects)
+            {
+                projectNames.Add(project.Name);
+            }
+
+            return projectNames;
+        }
+
+        public static List<List<String>> GetSolutionProjectItems(DTE dte)
+        {
+            List<List<String>> projectItems = new List<List<String>>();
+
+            EnvDTE.Solution solution = dte.Solution;
+            EnvDTE.Projects projects = solution.Projects;
+
+            foreach (EnvDTE.Project project in projects)
+            {
+                EnvDTE.ProjectItems items = project.ProjectItems;                
+
+                List<String> pItems = new List<String>();
+
+                foreach(EnvDTE.ProjectItem item in items)
+                {
+                    for (short i = 0; i < item.FileCount; i++)
+                    {
+                        pItems.Add(item.get_FileNames(i));
+                    }
+                }
+
+                projectItems.Add(pItems);
+            }
+
+            return projectItems;
+        }
+    }
+}
diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp
index 2d697424..c4a49b9f 100644
--- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp
+++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp
@@ -10,8 +10,6 @@
 #include "qt/utility/utilityQt.h"
 #include "qt/view/graphElements/QtGraphNodeData.h"
 
-#include <iostream>
-
 QtGraphNodeExpandToggle::QtGraphNodeExpandToggle(bool expanded, int invisibleSubNodeCount)
 	: m_invisibleSubNodeCount(invisibleSubNodeCount)
 	, m_expanded(expanded)