diff --git a/.gitignore b/.gitignore
index f5c287d..636e668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /*/*.csproj.user
 /*/bin/*
 /*/obj/*
-/*/StyleCop.cache
\ No newline at end of file
+/*/StyleCop.cache
+Whut.AttachTo.sln.GhostDoc.xml
diff --git a/Whut.AttachTo/AttachTo.vsct b/Whut.AttachTo/AttachTo.vsct
index 3bde0b6..516a59d 100755
--- a/Whut.AttachTo/AttachTo.vsct
+++ b/Whut.AttachTo/AttachTo.vsct
@@ -15,13 +15,13 @@
         defining some of the constants that we will use inside the file. -->
 
   <!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
-  <Extern href="stdidcmd.h"/>
+  <Extern href="stdidcmd.h" />
 
   <!--This header contains the command ids for the menus provided by the shell. -->
-  <Extern href="vsshlids.h"/>
+  <Extern href="vsshlids.h" />
 
   <!--Definition of some VSCT specific constants. In this sample we use it for the IDs inside the guidOfficeIcon group. -->
-  <Extern href="msobtnid.h"/>
+  <!--<Extern href="msobtnid.h" xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" />-->
 
   <!--The Commands section is where we the commands, menus and menu groups are defined.
       This section uses a Guid to identify the package that provides the command defined inside it. -->
@@ -40,7 +40,7 @@
          must be a menu. -->
     <Groups>
       <Group guid="guidAttachToCmdSet" id="WhutAttachToMenuGroup" priority="0x0600">
-        <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS"/>
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS" />
       </Group>
     </Groups>
     
@@ -74,7 +74,7 @@
           <ButtonText>Attach to IIS Express</ButtonText>
         </Strings>
       </Button>
-      
+
       <Button guid="guidAttachToCmdSet" id="cmdidWhutAttachToNUnit" priority="0x0100" type="Button">
         <Parent guid="guidAttachToCmdSet" id="WhutAttachToMenuGroup" />
         <Icon guid="guidImages" id="bmpPic1" />
@@ -93,7 +93,7 @@
             bitmap strip containing the bitmaps and then there are the numeric ids of the elements used 
             inside a button definition. An important aspect of this declaration is that the element id 
             must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
-      <Bitmap guid="guidImages" href="Resources\Images_32bit.bmp" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>
+      <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows" />
     </Bitmaps>
   </Commands>
 
@@ -109,12 +109,13 @@
       <IDSymbol name="cmdidWhutAttachToNUnit" value="0x0102" />
     </GuidSymbol>
     
-    <GuidSymbol name="guidImages" value="{7cecfc21-6262-422a-93dd-223db26a763c}" >
+    <GuidSymbol name="guidImages" value="{7cecfc21-6262-422a-93dd-223db26a763c}">
       <IDSymbol name="bmpPic1" value="1" />
       <IDSymbol name="bmpPic2" value="2" />
       <IDSymbol name="bmpPicSearch" value="3" />
       <IDSymbol name="bmpPicX" value="4" />
       <IDSymbol name="bmpPicArrows" value="5" />
+      <IDSymbol name="bmpPicStrikethrough" value="6" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/Whut.AttachTo/AttachToPackage.cs b/Whut.AttachTo/AttachToPackage.cs
index 05d10ad..99cc2fb 100755
--- a/Whut.AttachTo/AttachToPackage.cs
+++ b/Whut.AttachTo/AttachToPackage.cs
@@ -1,16 +1,51 @@
-using System;
-using System.ComponentModel.Design;
-using System.Linq;
-using System.Runtime.InteropServices;
-using EnvDTE;
-using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Shell;
+using PostSharp.Patterns.Diagnostics;
+using PostSharp.Extensibility;
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AttachToPackage.cs" company="">
+//   
+// </copyright>
+// <summary>
+//   This is the class that implements the package exposed by this assembly.
+//   The minimum requirement for a class to be considered a valid package for Visual Studio
+//   is to implement the IVsPackage interface and register itself with the shell.
+//   This package uses the helper classes defined inside the Managed Package Framework (MPF)
+//   to do it: it derives from the Package class that provides the implementation of the
+//   IVsPackage interface and uses the registration attributes defined in the framework to
+//   register itself and its components with the shell.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
 
 namespace Whut.AttachTo
 {
-    //// This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is a package.
+    using System;
+    using System.ComponentModel.Design;
+    using System.Diagnostics;
+    using System.Diagnostics.Contracts;
+    using System.Globalization;
+    using System.Linq;
+    using System.Runtime.InteropServices;
+
+    using EnvDTE;
+
+    using Microsoft.VisualStudio;
+    using Microsoft.VisualStudio.Shell;
+
+    using Process = EnvDTE.Process;
+
+    /// <summary>
+    ///     This is the class that implements the package exposed by this assembly.
+    ///     The minimum requirement for a class to be considered a valid package for Visual Studio
+    ///     is to implement the IVsPackage interface and register itself with the shell.
+    ///     This package uses the helper classes defined inside the Managed Package Framework (MPF)
+    ///     to do it: it derives from the Package class that provides the implementation of the
+    ///     IVsPackage interface and uses the registration attributes defined in the framework to
+    ///     register itself and its components with the shell.
+    /// </summary>
+    //// This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is
+    //// a package.
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    //// This attribute is used to register the informations needed to show the this package in the Help/About dialog of Visual Studio.
+    //// This attribute is used to register the information needed to show this package
+    //// in the Help/About dialog of Visual Studio.
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
     //// This attribute is needed to let the shell know that this package exposes some menus.
     [ProvideMenuResource("Menus.ctmenu", 1)]
@@ -20,34 +55,93 @@ namespace Whut.AttachTo
     [ProvideAutoLoad(VSConstants.UICONTEXT.NoSolution_string)]
     public sealed class AttachToPackage : Package
     {
+        #region Methods
+
+        /// <summary>
+        ///     Initialization of the package; this method is called right after the package is sited, so this is the place
+        ///     where you can put all the initialization code that rely on services provided by VisualStudio.
+        /// </summary>
         protected override void Initialize()
         {
+            Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this));
             base.Initialize();
 
-            OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
+            // Add our command handlers for menu (commands must exist in the .vsct file)
+            var oleMenuCommandService = this.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
+            if (oleMenuCommandService == null)
+            {
+                return;
+            }
+            
+            // Create the command for the menu item.
+            this.AddAttachToCommand(
+                oleMenuCommandService, 
+                PkgCmdIDList.cmdidWhutAttachToIIS, 
+                gop => gop.ShowAttachToIIS, 
+                "w3wp.exe");
 
-            this.AddAttachToCommand(mcs, PkgCmdIDList.cmdidWhutAttachToIIS, gop => gop.ShowAttachToIIS, "w3wp.exe");
-            this.AddAttachToCommand(mcs, PkgCmdIDList.cmdidWhutAttachToIISExpress, gop => gop.ShowAttachToIISExpress, "iisexpress.exe");
-            this.AddAttachToCommand(mcs, PkgCmdIDList.cmdidWhutAttachToNUnit, gop => gop.ShowAttachToNUnit, "nunit-agent.exe", "nunit.exe", "nunit-console.exe", "nunit-agent-x86.exe", "nunit-x86.exe", "nunit-console-x86.exe");
+            this.AddAttachToCommand(
+                oleMenuCommandService, 
+                PkgCmdIDList.cmdidWhutAttachToIISExpress, 
+                gop => gop.ShowAttachToIISExpress, 
+                "iisexpress.exe");
+
+            this.AddAttachToCommand(
+                oleMenuCommandService, 
+                PkgCmdIDList.cmdidWhutAttachToNUnit, 
+                gop => gop.ShowAttachToNUnit, 
+                "nunit-agent.exe", 
+                "nunit.exe", 
+                "nunit-console.exe", 
+                "nunit-agent-x86.exe", 
+                "nunit-x86.exe", 
+                "nunit-console-x86.exe");
         }
 
-        private void AddAttachToCommand(OleMenuCommandService mcs, uint commandId, Func<GeneralOptionsPage, bool> isVisible, params string[] programsToAttach)
+        /// <summary>
+        /// Adds the attach automatic command.
+        /// </summary>
+        /// <param name="oleMenuCommandService">
+        /// The MCS.
+        /// </param>
+        /// <param name="commandId">
+        /// The command unique identifier.
+        /// </param>
+        /// <param name="isVisible">
+        /// The is visible.
+        /// </param>
+        /// <param name="programsToAttach">
+        /// The programs automatic attach.
+        /// </param>
+        private void AddAttachToCommand(
+            IMenuCommandService oleMenuCommandService, 
+            uint commandId, 
+            Func<GeneralOptionsPage, bool> isVisible, 
+            params string[] programsToAttach)
         {
-            OleMenuCommand menuItemCommand = new OleMenuCommand(
-                delegate(object sender, EventArgs e)
-                {
-                    DTE dte = (DTE)this.GetService(typeof(DTE));
-                    foreach (Process process in dte.Debugger.LocalProcesses)
+            Contract.Requires<ArgumentNullException>(oleMenuCommandService != null);
+
+            var menuItemCommand = new OleMenuCommand(
+                delegate
                     {
-                        if (programsToAttach.Any(p => process.Name.EndsWith(p)))
+                        // ReSharper disable once IdentifierTypo
+                        var dte = (DTE)this.GetService(typeof(DTE));
+                        foreach (var process in
+                            dte.Debugger.LocalProcesses.Cast<Process>()
+                                .Where(process => programsToAttach.Any(p => process.Name.EndsWith(p))))
                         {
                             process.Attach();
                         }
-                    }
-                },
+                    }, 
                 new CommandID(GuidList.guidAttachToCmdSet, (int)commandId));
-            menuItemCommand.BeforeQueryStatus += (s, e) => menuItemCommand.Visible = isVisible((GeneralOptionsPage)this.GetDialogPage(typeof(GeneralOptionsPage)));
-            mcs.AddCommand(menuItemCommand);
+            
+            menuItemCommand.BeforeQueryStatus +=
+                (s, e) =>
+                menuItemCommand.Visible = isVisible((GeneralOptionsPage)this.GetDialogPage(typeof(GeneralOptionsPage)));
+
+            oleMenuCommandService.AddCommand(menuItemCommand);
         }
+
+        #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/Whut.AttachTo/Attributes/TraceAttribute.cs b/Whut.AttachTo/Attributes/TraceAttribute.cs
new file mode 100644
index 0000000..061c53b
--- /dev/null
+++ b/Whut.AttachTo/Attributes/TraceAttribute.cs
@@ -0,0 +1,133 @@
+namespace Whut.AttachTo.Attributes
+{
+    using System;
+    using System.Diagnostics;
+    using System.Reflection;
+    using System.Text;
+
+    using PostSharp.Aspects;
+
+    /// <summary>
+    ///     The trace attribute class.
+    /// </summary>
+    [Serializable]
+    public class TraceAttribute : OnMethodBoundaryAspect
+    {
+        #region Fields
+
+        /// <summary>
+        ///     The method name.
+        /// </summary>
+        private string methodName = "UnknownMethodName";
+
+        #endregion
+
+        #region Public Methods and Operators
+
+        /// <summary>
+        /// Method invoked at build time to initialize the instance fields of the current aspect. This method is invoked
+        ///     before any other build-time method.
+        /// </summary>
+        /// <param name="method">
+        /// Method to which the current aspect is applied
+        /// </param>
+        /// <param name="aspectInfo">
+        /// Reserved for future usage.
+        /// </param>
+        public override void CompileTimeInitialize(MethodBase method, AspectInfo aspectInfo)
+        {
+            base.CompileTimeInitialize(method, aspectInfo);
+
+            if (method.DeclaringType != null)
+            {
+                this.methodName = string.Format("{0}.{1}", method.DeclaringType.FullName, method.Name);
+            }
+        }
+
+        /// <summary>
+        /// Method executed <b>before</b> the body of methods to which this aspect is applied.
+        /// </summary>
+        /// <param name="args">
+        /// Event arguments specifying which method
+        ///     is being executed, which are its arguments, and how should the execution continue
+        ///     after the execution of
+        ///     <see cref="M:PostSharp.Aspects.IOnMethodBoundaryAspect.OnEntry(PostSharp.Aspects.MethodExecutionArgs)"/>.
+        /// </param>
+        public override void OnEntry(MethodExecutionArgs args)
+        {
+            base.OnEntry(args);
+
+            Trace.TraceInformation("{0}: Enter", this.methodName);
+            Trace.Indent();
+        }
+
+        /// <summary>
+        /// Method executed <b>after</b> the body of methods to which this aspect is applied,
+        ///     in case that the method resulted with an exception.
+        /// </summary>
+        /// <param name="args">
+        /// Event arguments specifying which method is being executed and which are its arguments.
+        /// </param>
+        public override void OnException(MethodExecutionArgs args)
+        {
+            base.OnException(args);
+
+            var stringBuilder = new StringBuilder(1024);
+
+            stringBuilder.AppendFormat("{0}(", this.methodName);
+            var instance = args.Instance;
+            if (instance != null)
+            {
+                stringBuilder.AppendFormat("this={0}", instance);
+                if (args.Arguments.Count > 0)
+                {
+                    stringBuilder.Append("; ");
+                }
+            }
+
+            for (var i = 0; i < args.Arguments.Count; i++)
+            {
+                if (i > 0)
+                {
+                    stringBuilder.Append(", ");
+                }
+
+                stringBuilder.Append(args.Arguments.GetArgument(i) ?? "null");
+            }
+
+            var guid = Guid.NewGuid();
+
+            stringBuilder.AppendFormat(
+                "): Exception {0} - {1}: {2}", 
+                guid, 
+                args.Exception.GetType().Name, 
+                args.Exception.Message);
+
+            Trace.Unindent();
+            Trace.TraceError(stringBuilder.ToString());
+
+            throw new ApplicationException(
+                string.Format(
+                    "An internal exception has occurred. Use the id {0} for further reference to this issue.", 
+                    guid));
+        }
+
+        /// <summary>
+        /// Method executed <b>after</b> the body of methods to which this aspect is applied,
+        ///     but only when the method successfully returns (i.e. when no exception flies out
+        ///     the method.).
+        /// </summary>
+        /// <param name="args">
+        /// Event arguments specifying which method is being executed and which are its arguments.
+        /// </param>
+        public override void OnSuccess(MethodExecutionArgs args)
+        {
+            base.OnSuccess(args);
+
+            Trace.Unindent();
+            Trace.TraceInformation("{0}: Success", this.methodName);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Whut.AttachTo/GeneralOptionsPage.cs b/Whut.AttachTo/GeneralOptionsPage.cs
index c0d32b3..7181fe4 100755
--- a/Whut.AttachTo/GeneralOptionsPage.cs
+++ b/Whut.AttachTo/GeneralOptionsPage.cs
@@ -1,10 +1,19 @@
-using System.ComponentModel;
-using Microsoft.VisualStudio.Shell;
-
-namespace Whut.AttachTo
+namespace Whut.AttachTo
 {
+    using System.ComponentModel;
+
+    using Microsoft.VisualStudio.Shell;
+
+    /// <summary>
+    ///     Class GeneralOptionsPage.
+    /// </summary>
     public class GeneralOptionsPage : DialogPage
     {
+        #region Constructors and Destructors
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="GeneralOptionsPage" /> class.
+        /// </summary>
         public GeneralOptionsPage()
         {
             this.ShowAttachToIIS = true;
@@ -12,22 +21,40 @@ public GeneralOptionsPage()
             this.ShowAttachToNUnit = true;
         }
 
+        #endregion
+
+        #region Public Properties
+
+        /// <summary>
+        ///     Gets or sets a value indicating whether [show attach automatic IIS].
+        /// </summary>
+        /// <value><c>true</c> if [show attach automatic IIS]; otherwise, <c>false</c>.</value>
         [Category("General")]
         [DisplayName("Show 'Attach to IIS' command")]
         [Description("Show 'Attach to IIS' command in Tools menu.")]
         [DefaultValue(true)]
         public bool ShowAttachToIIS { get; set; }
 
+        /// <summary>
+        ///     Gets or sets a value indicating whether [show attach automatic IIS express].
+        /// </summary>
+        /// <value><c>true</c> if [show attach automatic IIS express]; otherwise, <c>false</c>.</value>
         [Category("General")]
         [DisplayName("Show 'Attach to IIS Express command")]
         [Description("Show 'Attach to IIS Express command in Tools menu.")]
         [DefaultValue(true)]
         public bool ShowAttachToIISExpress { get; set; }
 
+        /// <summary>
+        ///     Gets or sets a value indicating whether [show attach automatic asynchronous unit].
+        /// </summary>
+        /// <value><c>true</c> if [show attach automatic asynchronous unit]; otherwise, <c>false</c>.</value>
         [Category("General")]
         [DisplayName("Show 'Attach to NUnit' command")]
         [Description("Show 'Attach to NUnit' command in Tools menu.")]
         [DefaultValue(true)]
         public bool ShowAttachToNUnit { get; set; }
+
+        #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/Whut.AttachTo/Guids.cs b/Whut.AttachTo/Guids.cs
index e609719..e1fa059 100755
--- a/Whut.AttachTo/Guids.cs
+++ b/Whut.AttachTo/Guids.cs
@@ -1,15 +1,27 @@
-// Guids.cs
-// MUST match guids.h
-using System;
-
-namespace Whut.AttachTo
+namespace Whut.AttachTo
 {
+    // Guids.cs
+    // MUST match guids.h
+    using System;
+
+    /// <summary>
+    /// Class GuidList.
+    /// </summary>
     public static class GuidList
     {
+        /// <summary>
+        /// The unique identifier attach automatic PKG string
+        /// </summary>
         public const string guidAttachToPkgString = "8d6080f0-7276-44d7-8dc4-6378fb6ce225";
 
+        /// <summary>
+        /// The unique identifier attach automatic command set string
+        /// </summary>
         public const string guidAttachToCmdSetString = "16e2ac5c-ec3d-4ff1-a237-11ccef54fe0f";
 
+        /// <summary>
+        /// The unique identifier attach automatic command set
+        /// </summary>
         public static readonly Guid guidAttachToCmdSet = new Guid(guidAttachToCmdSetString);
     }
 }
\ No newline at end of file
diff --git a/Whut.AttachTo/PkgCmdID.cs b/Whut.AttachTo/PkgCmdID.cs
index 31154ed..b24b511 100755
--- a/Whut.AttachTo/PkgCmdID.cs
+++ b/Whut.AttachTo/PkgCmdID.cs
@@ -1,14 +1,26 @@
-// PkgCmdID.cs
-// MUST match PkgCmdID.h
-
-namespace Whut.AttachTo
+namespace Whut.AttachTo
 {
+    // PkgCmdID.cs
+    // MUST match PkgCmdID.h
+
+    /// <summary>
+    /// Class PkgCmdIDList.
+    /// </summary>
     public static class PkgCmdIDList
     {
+        /// <summary>
+        /// The cmdid whut attach automatic IIS
+        /// </summary>
         public const uint cmdidWhutAttachToIIS = 0x100;
 
+        /// <summary>
+        /// The cmdid whut attach automatic IIS express
+        /// </summary>
         public const uint cmdidWhutAttachToIISExpress = 0x101;
 
+        /// <summary>
+        /// The cmdid whut attach automatic asynchronous unit
+        /// </summary>
         public const uint cmdidWhutAttachToNUnit = 0x102;
     }
 }
\ No newline at end of file
diff --git a/Whut.AttachTo/Properties/AssemblyInfo.cs b/Whut.AttachTo/Properties/AssemblyInfo.cs
index ce6778c..e433c26 100755
--- a/Whut.AttachTo/Properties/AssemblyInfo.cs
+++ b/Whut.AttachTo/Properties/AssemblyInfo.cs
@@ -3,6 +3,10 @@
 using System.Resources;
 using System.Runtime.InteropServices;
 
+using PostSharp.Extensibility;
+
+using Whut.AttachTo.Attributes;
+
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -19,13 +23,14 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // Version information for an assembly consists of the following four values:
-//
 //      Major Version
 //      Minor Version 
 //      Build Number
 //      Revision
-//
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.1.0")]
 [assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly:
+    Trace(AttributeTargetTypes = "Whut.AttachTo", AttributeTargetTypeAttributes = MulticastAttributes.Public, 
+        AttributeTargetMemberAttributes = MulticastAttributes.Public)]
diff --git a/Whut.AttachTo/Resources.Designer.cs b/Whut.AttachTo/Properties/Resources.Designer.cs
old mode 100755
new mode 100644
similarity index 91%
rename from Whut.AttachTo/Resources.Designer.cs
rename to Whut.AttachTo/Properties/Resources.Designer.cs
index 4de098e..f420ec0
--- a/Whut.AttachTo/Resources.Designer.cs
+++ b/Whut.AttachTo/Properties/Resources.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Whut.AttachTo {
+namespace Whut.AttachTo.Properties {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace Whut.AttachTo {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -39,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Whut.AttachTo.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Whut.AttachTo.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -59,6 +59,5 @@ internal Resources() {
                 resourceCulture = value;
             }
         }
-        
     }
 }
diff --git a/Whut.AttachTo/Resources.resx b/Whut.AttachTo/Properties/Resources.resx
old mode 100755
new mode 100644
similarity index 100%
rename from Whut.AttachTo/Resources.resx
rename to Whut.AttachTo/Properties/Resources.resx
diff --git a/Whut.AttachTo/RequiresPostSharp.cs b/Whut.AttachTo/RequiresPostSharp.cs
new file mode 100644
index 0000000..78562e4
--- /dev/null
+++ b/Whut.AttachTo/RequiresPostSharp.cs
@@ -0,0 +1,11 @@
+//
+// This file causes a build-time exception when PostSharp is not included in the build process.
+// To avoid false errors, do not open the file in Visual Studio, and ignore any error real-time 
+// verifiers such as Resharper may report.
+//
+// You can safely delete this file, but it will be recreated when you upgrade the NuGet package.
+//
+
+#if !POSTSHARP
+#error PostSharp is not introduced in the build process. If NuGet just restored the PostSharp package, you need to rebuild the solution.
+#endif
\ No newline at end of file
diff --git a/Whut.AttachTo/Resources/Images.png b/Whut.AttachTo/Resources/Images.png
new file mode 100644
index 0000000..bf17e6b
Binary files /dev/null and b/Whut.AttachTo/Resources/Images.png differ
diff --git a/Whut.AttachTo/Resources/Images_32bit.bmp b/Whut.AttachTo/Resources/Images_32bit.bmp
deleted file mode 100755
index 2fa7ab0..0000000
Binary files a/Whut.AttachTo/Resources/Images_32bit.bmp and /dev/null differ
diff --git a/Whut.AttachTo/Whut.AttachTo.csproj b/Whut.AttachTo/Whut.AttachTo.csproj
index e007f33..535eb57 100755
--- a/Whut.AttachTo/Whut.AttachTo.csproj
+++ b/Whut.AttachTo/Whut.AttachTo.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,7 +13,31 @@
     <AssemblyName>AttachTo</AssemblyName>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
+    <DontImportPostSharp>True</DontImportPostSharp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +47,44 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Debug\AttachTo.XML</DocumentationFile>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking>
+    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
+    <CodeContractsRuntimeThrowOnFailure>False</CodeContractsRuntimeThrowOnFailure>
+    <CodeContractsRuntimeCallSiteRequires>True</CodeContractsRuntimeCallSiteRequires>
+    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
+    <CodeContractsRunCodeAnalysis>True</CodeContractsRunCodeAnalysis>
+    <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
+    <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
+    <CodeContractsArithmeticObligations>True</CodeContractsArithmeticObligations>
+    <CodeContractsEnumObligations>True</CodeContractsEnumObligations>
+    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
+    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
+    <CodeContractsInferRequires>True</CodeContractsInferRequires>
+    <CodeContractsInferEnsures>True</CodeContractsInferEnsures>
+    <CodeContractsInferObjectInvariants>True</CodeContractsInferObjectInvariants>
+    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
+    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
+    <CodeContractsSuggestObjectInvariants>True</CodeContractsSuggestObjectInvariants>
+    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
+    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
+    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
+    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
+    <CodeContractsCustomRewriterAssembly />
+    <CodeContractsCustomRewriterClass />
+    <CodeContractsLibPaths />
+    <CodeContractsExtraRewriteOptions />
+    <CodeContractsExtraAnalysisOptions />
+    <CodeContractsSQLServerOption />
+    <CodeContractsBaseLineFile />
+    <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
+    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
+    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
+    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
+    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +94,43 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Release\AttachTo.XML</DocumentationFile>
+    <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking>
+    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
+    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
+    <CodeContractsRunCodeAnalysis>True</CodeContractsRunCodeAnalysis>
+    <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
+    <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
+    <CodeContractsArithmeticObligations>True</CodeContractsArithmeticObligations>
+    <CodeContractsEnumObligations>True</CodeContractsEnumObligations>
+    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
+    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
+    <CodeContractsInferRequires>True</CodeContractsInferRequires>
+    <CodeContractsInferEnsures>True</CodeContractsInferEnsures>
+    <CodeContractsInferObjectInvariants>True</CodeContractsInferObjectInvariants>
+    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
+    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
+    <CodeContractsSuggestObjectInvariants>True</CodeContractsSuggestObjectInvariants>
+    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
+    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
+    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
+    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
+    <CodeContractsCustomRewriterAssembly />
+    <CodeContractsCustomRewriterClass />
+    <CodeContractsLibPaths />
+    <CodeContractsExtraRewriteOptions />
+    <CodeContractsExtraAnalysisOptions />
+    <CodeContractsSQLServerOption />
+    <CodeContractsBaseLineFile />
+    <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
+    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
+    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
+    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
+    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
+    <CodeContractsRuntimeCallSiteRequires>True</CodeContractsRuntimeCallSiteRequires>
+    <CodeContractsRuntimeThrowOnFailure>False</CodeContractsRuntimeThrowOnFailure>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -40,11 +140,25 @@
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0">
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.10.0">
       <Private>false</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0" />
+    <Reference Include="PostSharp">
+      <HintPath>..\packages\PostSharp.3.0.40\lib\net20\PostSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="PostSharp.Patterns.Diagnostics">
+      <HintPath>..\packages\PostSharp.Patterns.Diagnostics.3.0.40\lib\net40\PostSharp.Patterns.Diagnostics.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -114,7 +228,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Guids.cs" />
-    <Compile Include="Resources.Designer.cs">
+    <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
@@ -122,9 +236,11 @@
     <Compile Include="AttachToPackage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PkgCmdID.cs" />
+    <Compile Include="RequiresPostSharp.cs" />
+    <Compile Include="Attributes\TraceAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
@@ -135,9 +251,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
+    <None Include="Whut.AttachTo.psproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />
@@ -148,7 +266,7 @@
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\Images_32bit.bmp" />
+    <None Include="Resources\Images.png" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\Package.ico" />
@@ -162,11 +280,38 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
   <!-- 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">
@@ -180,4 +325,5 @@
     <StartProgram>$(_VisualStudioInstallDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
+  <Import Project="..\packages\PostSharp.3.0.40\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.3.0.40\tools\PostSharp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Whut.AttachTo/Whut.AttachTo.psproj b/Whut.AttachTo/Whut.AttachTo.psproj
new file mode 100644
index 0000000..8b2e2e7
--- /dev/null
+++ b/Whut.AttachTo/Whut.AttachTo.psproj
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.postsharp.org/1.0/configuration" xmlns:dg="clr-namespace:PostSharp.Patterns.Diagnostics;assembly:PostSharp.Patterns.Diagnostics">
+  <Using File="..\packages\PostSharp.Patterns.Diagnostics.3.0.40\tools\PostSharp.Patterns.Diagnostics.Weaver.dll" />
+  <Property Name="LoggingBackend" Value="Console" />
+  <dg:LoggingProfiles>
+    <dg:LoggingProfile Name="Default" OnExceptionLevel="Info" />
+  </dg:LoggingProfiles>
+</Project>
\ No newline at end of file
diff --git a/Whut.AttachTo/packages.config b/Whut.AttachTo/packages.config
new file mode 100644
index 0000000..e645666
--- /dev/null
+++ b/Whut.AttachTo/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="PostSharp" version="3.0.40" targetFramework="net45" />
+  <package id="PostSharp.Patterns.Diagnostics" version="3.0.40" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/Whut.AttachTo/source.extension.vsixmanifest b/Whut.AttachTo/source.extension.vsixmanifest
index 26ed8b6..aa1bbae 100755
--- a/Whut.AttachTo/source.extension.vsixmanifest
+++ b/Whut.AttachTo/source.extension.vsixmanifest
@@ -18,6 +18,9 @@
       <VisualStudio Version="11.0">
         <Edition>Pro</Edition>
       </VisualStudio>
+      <VisualStudio Version="12.0">
+        <Edition>Pro</Edition>
+      </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
   </Identifier>