diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8994518
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "PythonScript"]
+	path = PythonScript
+	url = https://github.com/bruderstein/PythonScript.git
diff --git a/PythonScript b/PythonScript
new file mode 160000
index 0000000..ad939c8
--- /dev/null
+++ b/PythonScript
@@ -0,0 +1 @@
+Subproject commit ad939c8c8a345ad3020e9c98ba13f700d98eeff7
diff --git a/ZenCoding-Python.sln b/ZenCoding-Python.sln
index 4f3f68f..3de667d 100644
--- a/ZenCoding-Python.sln
+++ b/ZenCoding-Python.sln
@@ -3,32 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZenCoding-Python", "ZenCoding-Python.vcxproj", "{80FF6833-2672-4C8A-9943-827824BA599E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "..\PythonScript\NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "PythonScript\NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Debug-ANSI|Win32 = Debug-ANSI|Win32
 		Release|Win32 = Release|Win32
-		Release-ANSI|Win32 = Release-ANSI|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{80FF6833-2672-4C8A-9943-827824BA599E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{80FF6833-2672-4C8A-9943-827824BA599E}.Debug|Win32.Build.0 = Debug|Win32
-		{80FF6833-2672-4C8A-9943-827824BA599E}.Debug-ANSI|Win32.ActiveCfg = Debug|Win32
-		{80FF6833-2672-4C8A-9943-827824BA599E}.Debug-ANSI|Win32.Build.0 = Debug|Win32
 		{80FF6833-2672-4C8A-9943-827824BA599E}.Release|Win32.ActiveCfg = Release|Win32
 		{80FF6833-2672-4C8A-9943-827824BA599E}.Release|Win32.Build.0 = Release|Win32
-		{80FF6833-2672-4C8A-9943-827824BA599E}.Release-ANSI|Win32.ActiveCfg = Release|Win32
-		{80FF6833-2672-4C8A-9943-827824BA599E}.Release-ANSI|Win32.Build.0 = Release|Win32
 		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.ActiveCfg = Debug|Win32
 		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.Build.0 = Debug|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32
 		{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.ActiveCfg = Release|Win32
 		{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.Build.0 = Release|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.ActiveCfg = Release-ANSI|Win32
-		{69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ZenCoding-Python.vcxproj b/ZenCoding-Python.vcxproj
index 3ddde34..3f29f7c 100644
--- a/ZenCoding-Python.vcxproj
+++ b/ZenCoding-Python.vcxproj
@@ -43,7 +43,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>C:\WinDDK\7600.16385.1\inc\mfc42;$(IncludePath)</IncludePath>
+    <IncludePath>$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -51,17 +51,17 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZENCODINGPYTHON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>E:\work\PythonScript\NppPlugin\include;E:\work\PythonScript\PythonScript\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>PythonScript\NppPlugin\include;PythonScript\PythonScript\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>NppPlugin.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>E:\work\PythonScript\NppPlugin\bin\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>PythonScript\NppPlugin\bin\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(OutputPath)$(TargetFileName)" "c:\program files (x86)\Notepad++5.8\plugins"</Command>
+      <Command>if EXIST "c:\program files (x86)\Notepad++5.8\plugins" ( copy "$(OutputPath)$(TargetFileName)" "c:\program files (x86)\Notepad++5.8\plugins" )</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -72,7 +72,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZENCODINGPYTHON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>Z:\Projects\emmet-ws\PythonScript\PythonScript\include;Z:\Projects\emmet-ws\PythonScript\NppPlugin\include;E:\work\PythonScript\NppPlugin\include;E:\work\PythonScript\PythonScript\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>PythonScript\PythonScript\include;PythonScript\NppPlugin\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -81,7 +81,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>NppPlugin.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Z:\Projects\emmet-ws\PythonScript\NppPlugin\bin\Release;E:\work\PythonScript\NppPlugin\bin\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>PythonScript\NppPlugin\bin\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..a990ca8
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,66 @@
+version: 1.0.2.{build}
+image: Visual Studio 2015
+
+
+environment:
+  matrix:
+  - PlatformToolset: v140_xp
+  - PlatformToolset: v120_xp
+
+platform:
+    #- x64
+    - Win32
+
+configuration:
+    - Release
+    - Debug
+
+install:
+    - git submodule -q update --init
+    - if "%platform%"=="x64" set archi=amd64
+    - if "%platform%"=="Win32" set archi=x86
+    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+
+build_script:
+    - cd "%APPVEYOR_BUILD_FOLDER%"
+    - msbuild ZenCoding-Python.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+after_build:
+    - cd "%APPVEYOR_BUILD_FOLDER%"
+    - ps: >-
+
+        if ($env:PLATFORM -eq "x64") {
+            Push-AppveyorArtifact "$env:PLATFORM\$env:CONFIGURATION\EmmetNPP.dll" -FileName EmmetNPP.dll
+        }
+
+        if ($env:PLATFORM -eq "Win32" ) {
+            Push-AppveyorArtifact "$env:CONFIGURATION\EmmetNPP.dll" -FileName EmmetNPP.dll
+        }
+
+        if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v120_xp") {
+            if($env:PLATFORM -eq "x64"){
+            $ZipFileName = "EmmetNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
+            7z a $ZipFileName $env:PLATFORM\$env:CONFIGURATION\*.dll
+            }
+            if($env:PLATFORM -eq "Win32"){
+            $ZipFileName = "EmmetNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
+            7z a $ZipFileName $env:CONFIGURATION\*.dll
+            }
+        }
+
+artifacts:
+  - path: EmmetNPP_*.zip
+    name: releases
+
+deploy:
+    provider: GitHub
+    auth_token:
+        secure: !!TODO, see https://www.appveyor.com/docs/deployment/github/#provider-settings!!
+    artifact: releases
+    draft: false
+    prerelease: false
+    force_update: true
+    on:
+        appveyor_repo_tag: true
+        PlatformToolset: v120_xp
+        configuration: Release