diff --git a/README.md b/README.md
index e9de454..ef26a3f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # SurroundSelection
 
-[![Build status](https://ci.appveyor.com/api/projects/status/github/dail8859/SurroundSelection?branch=master&svg=true)](https://ci.appveyor.com/project/dail8859/SurroundSelection/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/y3rxu3o00clgxm7f?svg=true)](https://ci.appveyor.com/project/dail8859/surroundselection)
 
 Notepad++ plugin to automatically surround the selection in quotes/brackets/parenthesis/etc. This can also be used on multiple or rectangular selections.
 
@@ -17,7 +17,7 @@ Select some text and type one of the following characters:
 - `<` or `>`
 
 ## Installation
-Install the plugin by downloading it from the [Release](https://github.com/dail8859/SurroundSelection/releases) page and copy `SurroundSelection.dll` to your `plugins` folder.
+Install the plugin by downloading it from the [Release](https://github.com/dail8859/SurroundSelection/releases) page and copy `SurroundSelection.dll` to your `plugins` folder. You can also install it via the Plugin Admin or Plugin Manager (depending on your Notepad++ version).
 
 ## Development
 The code has been developed using MSVC 2015. Building the code will generate the DLL which can be used by Notepad++. For convenience, MSVC copies the DLL into the Notepad++ plugin directory.
diff --git a/appveyor.yml b/appveyor.yml
index c4dacaf..a6a084a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,13 +26,7 @@ after_build:
     - cd "%APPVEYOR_BUILD_FOLDER%"
     - ps: >-
 
-        if ($env:PLATFORM -eq "x64") {
-            Push-AppveyorArtifact "bin\$($env:CONFIGURATION)_$($env:PLATFORM)\SurroundSelection_64.dll" -FileName SurroundSelection_64.dll
-        }
-
-        if ($env:PLATFORM -eq "Win32" ) {
-            Push-AppveyorArtifact "bin\$($env:CONFIGURATION)_$($env:PLATFORM)\SurroundSelection.dll" -FileName SurroundSelection.dll
-        }
+        Push-AppveyorArtifact "bin\$($env:CONFIGURATION)_$($env:PLATFORM)\SurroundSelection.dll" -FileName SurroundSelection.dll
 
         if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") {
             if ($env:PLATFORM -eq "x64"){
diff --git a/src/SurroundSelection.vcxproj b/src/SurroundSelection.vcxproj
index cfbd845..e0b61cd 100644
--- a/src/SurroundSelection.vcxproj
+++ b/src/SurroundSelection.vcxproj
@@ -82,10 +82,10 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)_64</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>$(ProjectName)_64</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -115,7 +115,10 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>if EXIST "C:\Program Files (x86)\Notepad++\plugins" (copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins")</Command>
+      <Command>if EXIST "C:\Program Files (x86)\Notepad++\plugins\" (
+  mkdir "C:\Program Files (x86)\Notepad++\plugins\$(TargetName)"
+  copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins\$(TargetName)"
+)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -135,7 +138,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_64.dll</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -145,7 +148,10 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>if EXIST "C:\Program Files\Notepad++\plugins" (copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins")</Command>
+      <Command>if EXIST "C:\Program Files\Notepad++\plugins\" (
+  mkdir "C:\Program Files\Notepad++\plugins\$(TargetName)"
+  copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins\$(TargetName)"
+)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -171,7 +177,10 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>if EXIST "C:\Program Files (x86)\Notepad++\plugins" (copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins")</Command>
+      <Command>if EXIST "C:\Program Files (x86)\Notepad++\plugins\" (
+  mkdir "C:\Program Files (x86)\Notepad++\plugins\$(TargetName)"
+  copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins\$(TargetName)"
+)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -187,7 +196,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_64.dll</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -196,7 +205,10 @@
       <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>if EXIST "C:\Program Files\Notepad++\plugins" (copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins")</Command>
+      <Command>if EXIST "C:\Program Files\Notepad++\plugins\" (
+  mkdir "C:\Program Files\Notepad++\plugins\$(TargetName)"
+  copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins\$(TargetName)"
+)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>