diff --git a/CHANGELOG.md b/CHANGELOG.md
index abb2cd7..ce50fea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,3 +132,10 @@ on the official Visual Studio extension gallery.
 **2017-08-20**
 
 - [x] Fixed a issues while opening the outpath of a cleaned project
+
+## 1.1.0.15
+
+**2017-12-12**
+
+- [x] Added open folder button to solution context menu
+- [x] Updated the dependencies
diff --git a/ConEmuIntegration/ConEmuIntegration.csproj b/ConEmuIntegration/ConEmuIntegration.csproj
index 6e98b57..9caf17d 100644
--- a/ConEmuIntegration/ConEmuIntegration.csproj
+++ b/ConEmuIntegration/ConEmuIntegration.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -46,7 +46,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ConEmuIntegration</RootNamespace>
     <AssemblyName>ConEmuIntegration</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -88,6 +88,7 @@
     </Compile>
     <Compile Include="SolutionExplorer\ExecuteInConEmu.cs" />
     <Compile Include="SolutionExplorer\OpenConEmuHere.cs" />
+    <Compile Include="SolutionExplorer\OpenConEmuHereSolution.cs" />
     <Compile Include="SolutionExplorer\OpenInConEmu.cs" />
     <Compile Include="SolutionExplorer\OpenOutpathInConEmu.cs" />
     <Compile Include="ToolWindow\ConEmuWindow.cs" />
@@ -147,18 +148,18 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26606\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.4.27004\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.0.26606\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.4.27004\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -166,7 +167,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26606\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.4.27004\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -220,15 +221,17 @@
       <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.3.83\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=15.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.5.24\lib\net46\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.0.26607\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.4.27004\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.23\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -294,16 +297,16 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\packages\ConEmu.Core.16.12.6.0\build\ConEmu.Core.Targets" Condition="Exists('..\packages\ConEmu.Core.16.12.6.0\build\ConEmu.Core.Targets')" />
-  <Import Project="..\packages\ConEmu.Core.17.8.7.0\Build\ConEmu.Core.Targets" Condition="Exists('..\packages\ConEmu.Core.17.8.7.0\Build\ConEmu.Core.Targets')" />
+  <Import Project="..\packages\ConEmu.Core.17.12.5\build\ConEmu.Core.Targets" Condition="Exists('..\packages\ConEmu.Core.17.12.5\build\ConEmu.Core.Targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\ConEmu.Core.17.8.7.0\Build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConEmu.Core.17.8.7.0\Build\ConEmu.Core.Targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\packages\ConEmu.Core.17.12.5\build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConEmu.Core.17.12.5\build\ConEmu.Core.Targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/ConEmuIntegration/ConEmuProduct/ProductEnvironment.cs b/ConEmuIntegration/ConEmuProduct/ProductEnvironment.cs
index 88e03e6..ab3e6cb 100644
--- a/ConEmuIntegration/ConEmuProduct/ProductEnvironment.cs
+++ b/ConEmuIntegration/ConEmuProduct/ProductEnvironment.cs
@@ -16,15 +16,12 @@
 using ConEmu.WinForms;
 using ConEmuIntegration.Settings;
 using ConEmuIntegration.ToolWindow;
-using EnvDTE;
-using EnvDTE80;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Xml;
 
 namespace ConEmuIntegration.ConEmuProduct
 {
diff --git a/ConEmuIntegration/ConEmuWindowPackage.cs b/ConEmuIntegration/ConEmuWindowPackage.cs
index 7c59ffd..7a184a3 100644
--- a/ConEmuIntegration/ConEmuWindowPackage.cs
+++ b/ConEmuIntegration/ConEmuWindowPackage.cs
@@ -44,6 +44,7 @@ protected override void Initialize()
             ConEmuWindowCommand.Initialize(this);
             base.Initialize();
             SolutionExplorer.OpenConEmuHere.Initialize(this);
+            SolutionExplorer.OpenConEmuHereSolution.Initialize(this);
             SolutionExplorer.ExecuteInConEmu.Initialize(this);
             SolutionExplorer.OpenOutpathInConEmu.Initialize(this);
         }
diff --git a/ConEmuIntegration/ConEmuWindowPackage.vsct b/ConEmuIntegration/ConEmuWindowPackage.vsct
index 2e7fea1..3f2c675 100644
--- a/ConEmuIntegration/ConEmuWindowPackage.vsct
+++ b/ConEmuIntegration/ConEmuWindowPackage.vsct
@@ -1,97 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-    <Extern href="stdidcmd.h" />
-    <Extern href="vsshlids.h" />
+  <Extern href="stdidcmd.h" />
+  <Extern href="vsshlids.h" />
 
-    <Commands package="guidConEmuWindowPackage">
-        <Menus>
-            <Menu guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" priority="0x202" type="Menu">
-                <Strings>
-                    <ButtonText>ConEmu</ButtonText>
-                    <CommandName>ConEmu</CommandName>
-                </Strings>
-            </Menu>
-        </Menus>
+  <Commands package="guidConEmuWindowPackage">
+    <Menus>
+      <Menu guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" priority="0x202" type="Menu">
+        <Strings>
+          <ButtonText>ConEmu</ButtonText>
+          <CommandName>ConEmu</CommandName>
+        </Strings>
+      </Menu>
+    </Menus>
 
-        <Buttons>
-            <Button guid="guidConEmuWindowPackageCmdSet" id="ConEmuWindowCommandId" priority="0x0100" type="Button">
-                <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1" />
-                <Icon guid="guidImages" id="bmpConsole" />
-                <Strings>
-                    <ButtonText>ConEmu Console</ButtonText>
-                </Strings>
-            </Button>
-            <Button guid="guidConEmuWindowPackageCmdSet1" id="cmdidOpenConEmuHere" priority="0x0101" type="Button">
-                <Parent guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" />
-                <Icon guid="guidImages" id="bmpConsole" />
-                <Strings>
-                    <ButtonText>Open folder in ConEmu</ButtonText>
-                </Strings>
-            </Button>
-            <Button guid="guidConEmuWindowPackageCmdSet2" id="cmdidExecuteInConEmu" priority="0x0100" type="Button">
-                <Parent guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" />
-                <Icon guid="guidImages" id="bmpConsole" />
-                <Strings>
-                    <ButtonText>Execute in ConEmu</ButtonText>
-                </Strings>
-            </Button>
-            <Button guid="guidConEmuWindowPackageCmdSet3" id="cmdidOpenOutpathInConEmu" priority="0x0102" type="Button">
-                <Parent guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" />
-                <Icon guid="guidImages" id="bmpConsole" />
-                <Strings>
-                    <ButtonText>Open outpath in ConEmu</ButtonText>
-                </Strings>
-            </Button>
-        </Buttons>
+    <Buttons>
+      <Button guid="guidConEmuWindowPackageCmdSet" id="ConEmuWindowCommandId" priority="0x0100" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1" />
+        <Icon guid="guidImages" id="bmpConsole" />
+        <Strings>
+          <ButtonText>ConEmu Console</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidConEmuWindowPackageCmdSet1" id="cmdidOpenConEmuHere" priority="0x0101" type="Button">
+        <Parent guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" />
+        <Icon guid="guidImages" id="bmpConsole" />
+        <Strings>
+          <ButtonText>Open folder in ConEmu</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidConEmuWindowPackageCmdSet4" id="OpenSolutionFolderId" priority="0x0100" type="Button">
+        <Parent guid="guidConEmuWindowPackageCmdSet4" id="OpenSolutionFolderMenuGroup" />
+        <Icon guid="guidImages" id="bmpConsole" />
+        <Strings>
+          <ButtonText>Open folder in ConEmu</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidConEmuWindowPackageCmdSet2" id="cmdidExecuteInConEmu" priority="0x0100" type="Button">
+        <Parent guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" />
+        <Icon guid="guidImages" id="bmpConsole" />
+        <Strings>
+          <ButtonText>Execute in ConEmu</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidConEmuWindowPackageCmdSet3" id="cmdidOpenOutpathInConEmu" priority="0x0102" type="Button">
+        <Parent guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" />
+        <Icon guid="guidImages" id="bmpConsole" />
+        <Strings>
+          <ButtonText>Open outpath in ConEmu</ButtonText>
+        </Strings>
+      </Button>
+    </Buttons>
 
-        <Bitmaps>
-            <Bitmap guid="guidImages" href="Resources\ConEmuWindowPackage.ico" usedList="bmpConsole" />
-        </Bitmaps>
+    <Bitmaps>
+      <Bitmap guid="guidImages" href="Resources\ConEmuWindowPackage.ico" usedList="bmpConsole" />
+    </Bitmaps>
 
-        <Groups>
-            <Group guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" priority="0x0300">
-                <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_ITEMNODE"/>
-            </Group>
-            <Group guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" priority="0x0300">
-                <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJNODE"/>
-            </Group>
-        </Groups>
-    </Commands>
+    <Groups>
+      <Group guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" priority="0x0300">
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_ITEMNODE"/>
+      </Group>
+      <Group guid="guidSolutionExplorerCmdSet" id="ConEmuGroupSubMenu" priority="0x0300">
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJNODE"/>
+      </Group>
+      <Group guid="guidConEmuWindowPackageCmdSet4" id="OpenSolutionFolderMenuGroup" priority="0x0600">
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_SOLNNODE" />
+      </Group>
+    </Groups>
+  </Commands>
 
-    <KeyBindings>
-        <KeyBinding guid="guidConEmuWindowPackageCmdSet" id="ConEmuWindowCommandId"
-                    editor="guidVSStd97" key1="w" mod1="Control" key2="w" mod2="Control"/>
-    </KeyBindings>
+  <KeyBindings>
+    <KeyBinding guid="guidConEmuWindowPackageCmdSet" id="ConEmuWindowCommandId"
+                editor="guidVSStd97" key1="w" mod1="Control" key2="w" mod2="Control"/>
+  </KeyBindings>
 
-    <Symbols>
-        <GuidSymbol name="guidConEmuWindowPackage" value="{ff00f158-c7e9-46b0-a559-e1b3c8996343}" />
+  <Symbols>
+    <GuidSymbol name="guidConEmuWindowPackage" value="{ff00f158-c7e9-46b0-a559-e1b3c8996343}" />
 
-        <GuidSymbol name="guidSolutionExplorerCmdSet" value="{1DAB6CF5-60B7-480B-920A-B5AA8F1EA0CD}">
-            <IDSymbol value="1061" name="ConEmuGroupSubMenu"  />
-        </GuidSymbol>
+    <GuidSymbol name="guidSolutionExplorerCmdSet" value="{1DAB6CF5-60B7-480B-920A-B5AA8F1EA0CD}">
+      <IDSymbol value="1061" name="ConEmuGroupSubMenu"  />
+    </GuidSymbol>
 
-        <GuidSymbol name="guidConEmuWindowPackageCmdSet" value="{5df544d6-c00a-4471-936b-d5441108ccfd}">
-            <IDSymbol name="ConEmuWindowCommandId" value="0x0100" />
-        </GuidSymbol>
+    <GuidSymbol name="guidConEmuWindowPackageCmdSet" value="{5df544d6-c00a-4471-936b-d5441108ccfd}">
+      <IDSymbol name="ConEmuWindowCommandId" value="0x0100" />
+    </GuidSymbol>
 
-        <GuidSymbol name="guidImages" value="{51d24e77-218b-4bb4-8a7b-c77fb698b830}">
-            <IDSymbol name="bmpConsole" value="1" />
-        </GuidSymbol>
+    <GuidSymbol name="guidImages" value="{51d24e77-218b-4bb4-8a7b-c77fb698b830}">
+      <IDSymbol name="bmpConsole" value="1" />
+    </GuidSymbol>
 
-        <GuidSymbol value="{c75f2974-4759-448c-bf2a-c400d83fe990}" name="guidConEmuWindowPackageCmdSet1">
-            <IDSymbol value="1061" name="ConEmuGroupSub" />
-            <IDSymbol value="256" name="cmdidOpenConEmuHere" />
-        </GuidSymbol>
+    <GuidSymbol value="{c75f2974-4759-448c-bf2a-c400d83fe990}" name="guidConEmuWindowPackageCmdSet1">
+      <IDSymbol value="1061" name="ConEmuGroupSub" />
+      <IDSymbol value="256" name="cmdidOpenConEmuHere" />
+    </GuidSymbol>
 
-        <GuidSymbol value="{074e29bb-eb5c-4400-9ef0-f8abfbbe337b}" name="guidConEmuWindowPackageCmdSet2">
-            <IDSymbol value="1061" name="ConEmuGroupSub" />
-            <IDSymbol value="256" name="cmdidExecuteInConEmu" />
-        </GuidSymbol>
+    <GuidSymbol value="{074e29bb-eb5c-4400-9ef0-f8abfbbe337b}" name="guidConEmuWindowPackageCmdSet2">
+      <IDSymbol value="1061" name="ConEmuGroupSub" />
+      <IDSymbol value="256" name="cmdidExecuteInConEmu" />
+    </GuidSymbol>
 
-        <GuidSymbol value="{5f17d8c2-738d-4d1b-8f18-8458da05717d}" name="guidConEmuWindowPackageCmdSet3">
-            <IDSymbol value="1061" name="ConEmuGroupSub" />
-            <IDSymbol value="256" name="cmdidOpenOutpathInConEmu" />
-        </GuidSymbol>
-    </Symbols>
+    <GuidSymbol value="{5f17d8c2-738d-4d1b-8f18-8458da05717d}" name="guidConEmuWindowPackageCmdSet3">
+      <IDSymbol value="1061" name="ConEmuGroupSub" />
+      <IDSymbol value="256" name="cmdidOpenOutpathInConEmu" />
+    </GuidSymbol>
+
+    <GuidSymbol value="{4462A7A2-54DC-4D38-8F7E-B1725A2AA73B}" name="guidConEmuWindowPackageCmdSet4">
+      <IDSymbol name="OpenSolutionFolderMenuGroup" value="0x1020" />
+      <IDSymbol name="OpenSolutionFolderId" value="0x0100" />
+    </GuidSymbol>
+  </Symbols>
 </CommandTable>
diff --git a/ConEmuIntegration/Helper/Folders.cs b/ConEmuIntegration/Helper/Folders.cs
index 997dc8f..d535455 100644
--- a/ConEmuIntegration/Helper/Folders.cs
+++ b/ConEmuIntegration/Helper/Folders.cs
@@ -20,9 +20,39 @@ namespace ConEmuIntegration.Helper
 {
     internal sealed class Folders
     {
+        public string GetSolutionPath(Solution sln)
+        {
+            var slnFile = new FileInfo(sln.FullName);
+            if (slnFile.Directory.Exists)
+            {
+                return slnFile.Directory.FullName;
+            }
+            return string.Empty;
+        }
+
+        public string GetProjectPath(Project proj)
+        {
+            // C# Project has the FullPath property
+            if (HasProperty(proj.Properties, "FullPath"))
+            {
+                var filePath = proj.Properties.Item("FullPath").Value.ToString();
+                var fullPath = new FileInfo(filePath);
+                return fullPath.Directory.FullName;
+            }
+
+            // C++ Project has the ProjectFile property
+            if (HasProperty(proj.Properties, "ProjectFile"))
+            {
+                var filePath = proj.Properties.Item("ProjectFile").Value.ToString();
+                var fullPath = new FileInfo(filePath);
+                return fullPath.Directory.FullName;
+            }
+            return string.Empty;
+        }
+
         public string GetProjectItemPath(ProjectItem item)
         {
-            if (PropertyHelper.HasProperty(item.Properties, "FullPath") == false)
+            if (HasProperty(item.Properties, "FullPath") == false)
             {
                 return string.Empty;
             }
@@ -39,23 +69,37 @@ public string GetProjectItemPath(ProjectItem item)
 
         public string GetOutputPath(Project proj)
         {
-            var prjPath = ProjectPath.GetProjectPath(proj);
+            var prjPath = GetProjectPath(proj);
             if (string.IsNullOrWhiteSpace(prjPath))
             {
                 return string.Empty;
             }
 
+            Properties prop = null;
             string probKey = string.Empty;
-            var prop = PropertyHelper.GetActiveConfigurationProperties(proj);
-            if (PropertyHelper.HasProperty(prop, "PrimaryOutput"))
+            if (proj.ConfigurationManager.ActiveConfiguration.Properties == null)
             {
-                probKey = "PrimaryOutput";
+                if (HasProperty(proj.Properties, "ActiveConfiguration") == false)
+                {
+                    return string.Empty;
+                }
+
+                prop = proj.Properties.Item("ActiveConfiguration").Value as Properties;
+                if (HasProperty(prop, "PrimaryOutput"))
+                {
+                    probKey = "PrimaryOutput";
+                }
             }
-            else if (PropertyHelper.HasProperty(prop, "OutputPath"))
+            else
             {
-                probKey = "OutputPath";
+                prop = proj.ConfigurationManager.ActiveConfiguration.Properties;
+                if (HasProperty(prop, "OutputPath"))
+                {
+                    probKey = "OutputPath";
+                }
             }
-            else
+
+            if (HasProperty(prop, probKey) == false)
             {
                 return string.Empty;
             }
@@ -66,11 +110,30 @@ public string GetOutputPath(Project proj)
                 filePath = Path.Combine(prjPath, filePath);
             }
 
-            if(Directory.Exists(filePath))
+            var attr = File.GetAttributes(filePath);
+            if (attr.HasFlag(FileAttributes.Directory))
             {
                 return filePath;
             }
-            return new FileInfo(filePath).Directory.FullName;
+            else
+            {
+                return new FileInfo(filePath).Directory.FullName;
+            }
+        }
+
+        private bool HasProperty(Properties properties, string propertyName)
+        {
+            if (properties != null)
+            {
+                foreach (Property item in properties)
+                {
+                    if (item != null && item.Name == propertyName)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
         }
     }
 }
diff --git a/ConEmuIntegration/SolutionExplorer/ExecuteInConEmu.cs b/ConEmuIntegration/SolutionExplorer/ExecuteInConEmu.cs
index 34bd920..d3f0803 100644
--- a/ConEmuIntegration/SolutionExplorer/ExecuteInConEmu.cs
+++ b/ConEmuIntegration/SolutionExplorer/ExecuteInConEmu.cs
@@ -20,7 +20,6 @@
 using ConEmuIntegration.ConEmuProduct;
 using EnvDTE80;
 using EnvDTE;
-using ConEmuIntegration.ToolWindow;
 using ConEmuIntegration.Helper;
 using System.IO;
 
diff --git a/ConEmuIntegration/SolutionExplorer/OpenConEmuHere.cs b/ConEmuIntegration/SolutionExplorer/OpenConEmuHere.cs
index 341f317..4567fa5 100644
--- a/ConEmuIntegration/SolutionExplorer/OpenConEmuHere.cs
+++ b/ConEmuIntegration/SolutionExplorer/OpenConEmuHere.cs
@@ -64,8 +64,8 @@ public static void Initialize(Package package)
 
         private void MenuItemCallback(object sender, EventArgs e)
         {
-            m_OpenInConEmu.Open();
             ExecuteInConEmu.Instance.DisplayConEmu();
+            m_OpenInConEmu.Open();
         }
     }
 }
diff --git a/ConEmuIntegration/SolutionExplorer/OpenConEmuHereSolution.cs b/ConEmuIntegration/SolutionExplorer/OpenConEmuHereSolution.cs
new file mode 100644
index 0000000..a675df2
--- /dev/null
+++ b/ConEmuIntegration/SolutionExplorer/OpenConEmuHereSolution.cs
@@ -0,0 +1,71 @@
+//
+// Copyright 2017 David Roller
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+using System;
+using System.ComponentModel.Design;
+using Microsoft.VisualStudio.Shell;
+
+namespace ConEmuIntegration.SolutionExplorer
+{
+    internal sealed class OpenConEmuHereSolution
+    {
+        public const int CommandId = 256;
+
+        public static readonly Guid CommandSet = new Guid("4462A7A2-54DC-4D38-8F7E-B1725A2AA73B");
+
+        private readonly Package package;
+
+        private OpenInConEmu m_OpenInConEmu;
+
+        private OpenConEmuHereSolution(Package package)
+        {
+            this.package = package ?? throw new ArgumentNullException("package");
+            m_OpenInConEmu = new OpenInConEmu();
+
+            OleMenuCommandService commandService = this.ServiceProvider.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
+            if (commandService != null)
+            {
+                var menuCommandID = new CommandID(CommandSet, CommandId);
+                var menuItem = new MenuCommand(this.MenuItemCallback, menuCommandID);
+                commandService.AddCommand(menuItem);
+            }
+        }
+
+        public static OpenConEmuHereSolution Instance
+        {
+            get;
+            private set;
+        }
+
+        private IServiceProvider ServiceProvider
+        {
+            get
+            {
+                return this.package;
+            }
+        }
+
+        public static void Initialize(Package package)
+        {
+            Instance = new OpenConEmuHereSolution(package);
+        }
+
+        private void MenuItemCallback(object sender, EventArgs e)
+        {
+            ExecuteInConEmu.Instance.DisplayConEmu();
+            m_OpenInConEmu.OpenSolution();
+        }
+    }
+}
diff --git a/ConEmuIntegration/SolutionExplorer/OpenInConEmu.cs b/ConEmuIntegration/SolutionExplorer/OpenInConEmu.cs
index 83a46b0..a37860c 100644
--- a/ConEmuIntegration/SolutionExplorer/OpenInConEmu.cs
+++ b/ConEmuIntegration/SolutionExplorer/OpenInConEmu.cs
@@ -19,12 +19,36 @@
 using EnvDTE80;
 using Microsoft.VisualStudio.Shell.Interop;
 using System;
-using System.IO;
 
 namespace ConEmuIntegration.SolutionExplorer
 {
     internal sealed class OpenInConEmu
     {
+        public void OpenSolution()
+        {
+            if (ProductEnvironment.Instance.Package == null)
+            {
+                return;
+            }
+
+            var provider = ProductEnvironment.Instance.Package as IServiceProvider;
+            var dte = provider.GetService(typeof(SDTE)) as DTE2;
+            if (dte.SelectedItems.Count <= 0)
+            {
+                return;
+            }
+
+            var folders = new Folders();
+            var path = folders.GetSolutionPath(dte.Solution);
+
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                return;
+            }
+
+            SendChangeFolder(path);
+        }
+
         public void Open()
         {
             if(ProductEnvironment.Instance.Package == null)
@@ -39,90 +63,41 @@ public void Open()
                 return;
             }
 
+            var folders = new Folders();
             foreach (SelectedItem selectedItem in dte.SelectedItems)
             {
+                var path = "";
                 if (selectedItem.Project != null)
                 {
-                    // C# Project has the FullPath property
-                    if (FolderOfProject(selectedItem, "FullPath"))
-                    {
-                        return;
-                    }
-
-                    // C++ Project has the ProjectFile property
-                    if (FolderOfProject(selectedItem, "ProjectFile"))
-                    {
-                        return;
-                    }
+                    path = folders.GetProjectPath(selectedItem.Project);
                 }
 
                 if (selectedItem.ProjectItem != null)
                 {
-                    if (FolderOfProjectItem(selectedItem))
-                    {
-                        return;
-                    }
+                    path = folders.GetProjectItemPath(selectedItem.ProjectItem);
+                }
+
+                if (string.IsNullOrWhiteSpace(path) == false)
+                {
+                    SendChangeFolder(path);
+                    return;
                 }
             }
         }
 
-        private bool FolderOfProjectItem(SelectedItem selectedItem)
+        private void SendChangeFolder(string folder)
         {
-            if (selectedItem.ProjectItem == null)
-            {
-                return false;
-            }
-
-            var projectItem = selectedItem.ProjectItem;
-            var fullPathProperty = projectItem.Properties.Item("FullPath");
-
-            if (fullPathProperty == null)
-            {
-                return false;
-            }
-
-            var fullPath = new FileInfo(fullPathProperty.Value.ToString());
-
             var cd = ProductEnvironment.Instance.UseNormalChangeDirectory();
             if (cd)
             {
                 ProductEnvironment.Instance.ExecuteGuiMacro("Print(@\"cd \"\"" +
-                    fullPath.Directory.FullName.Replace("\"", "\"\"") + "\"\"\",\"\n\")");
+                    folder.Replace("\"", "\"\"") + "\"\"\",\"\n\")");
             }
             else
             {
                 ProductEnvironment.Instance.ExecuteGuiMacro("Print(@\"cd /d \"\"" +
-                    fullPath.Directory.FullName.Replace("\"", "\"\"") + "\"\"\",\"\n\")");
-            }
-            return true;
-        }
-
-        private bool FolderOfProject(SelectedItem selectedItem, string property)
-        {
-            if (selectedItem.Project == null)
-            {
-                return false;
-            }
-            
-            if (selectedItem.Project != null)
-            {
-                var path = ProjectPath.GetProjectPath(selectedItem.Project);
-                var fullPath = new FileInfo(path);
-
-                var cd = ProductEnvironment.Instance.UseNormalChangeDirectory();
-                if (cd)
-                {
-                    ProductEnvironment.Instance.ExecuteGuiMacro("Print(@\"cd \"\"" +
-                        fullPath.Directory.FullName.Replace("\"", "\"\"") + "\"\"\",\"\n\")");
-                }
-                else
-                {
-                    ProductEnvironment.Instance.ExecuteGuiMacro("Print(@\"cd /d \"\"" +
-                        fullPath.Directory.FullName.Replace("\"", "\"\"") + "\"\"\",\"\n\")");
-                }
-                return true;
+                    folder.Replace("\"", "\"\"") + "\"\"\",\"\n\")");
             }
-            return false;
         }
     }
 }
diff --git a/ConEmuIntegration/ToolWindow/ConEmuWindowCommand.cs b/ConEmuIntegration/ToolWindow/ConEmuWindowCommand.cs
index b789e11..5ce3cd0 100644
--- a/ConEmuIntegration/ToolWindow/ConEmuWindowCommand.cs
+++ b/ConEmuIntegration/ToolWindow/ConEmuWindowCommand.cs
@@ -16,7 +16,6 @@
 using System;
 using System.ComponentModel.Design;
 using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
 using ConEmuIntegration.ConEmuProduct;
 
 namespace ConEmuIntegration.ToolWindow
diff --git a/ConEmuIntegration/app.config b/ConEmuIntegration/app.config
index 98b1aae..f880e95 100644
--- a/ConEmuIntegration/app.config
+++ b/ConEmuIntegration/app.config
@@ -12,12 +12,28 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-15.5.0.0" newVersion="15.5.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.VisualStudio.Imaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.14.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.11.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.12.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
diff --git a/ConEmuIntegration/packages.config b/ConEmuIntegration/packages.config
index 423b80f..0064c67 100644
--- a/ConEmuIntegration/packages.config
+++ b/ConEmuIntegration/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ConEmu.Control.WinForms" version="1.0.20160518.0" targetFramework="net452" />
-  <package id="ConEmu.Core" version="17.8.7.0" targetFramework="net462" />
+  <package id="ConEmu.Core" version="17.12.5" targetFramework="net461" />
   <package id="EnvDTE" version="8.0.1" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26606" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Imaging" version="15.0.26606" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.4.27004" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Imaging" version="15.4.27004" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26606" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.4.27004" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="15.0.25414" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="15.0.25414" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="15.0.25414" targetFramework="net462" />
@@ -20,10 +20,10 @@
   <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Threading" version="15.3.83" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26607" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Validation" version="15.3.23" targetFramework="net462" />
-  <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.VisualStudio.Threading" version="15.5.24" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.4.27004" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net461" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.5.100" targetFramework="net461" developmentDependency="true" />
   <package id="stdole" version="7.0.3301" targetFramework="net462" />
   <package id="VSLangProj" version="7.0.3300" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/ConEmuIntegration/source.extension.vsixmanifest b/ConEmuIntegration/source.extension.vsixmanifest
index d6e4d18..fb45dbc 100644
--- a/ConEmuIntegration/source.extension.vsixmanifest
+++ b/ConEmuIntegration/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?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="da4195aa-018f-4bb3-9443-37f4f5e16d94" Version="2.0.0.14" Language="en-US" Publisher="David Roller" />
+        <Identity Id="da4195aa-018f-4bb3-9443-37f4f5e16d94" Version="2.0.0.15" Language="en-US" Publisher="David Roller" />
         <DisplayName>ConEmuIntegration</DisplayName>
         <Description xml:space="preserve">Integrate the console emulator ConEmu in Visual Studio</Description>
         <License>Resources\LICENSE</License>