diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..bf98cda
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required (VERSION 2.6)
+project (miniweb)
+
+add_executable(miniweb 
+               miniweb.c 
+               httppil.c http.c httpxml.c httphandler.c httppost.c httpauth.c loadplugin.c
+               win32/win_compat.h httpint.h httpapi.h httpxml.h
+               )
+
+add_subdirectory(plugin)
+
+if(UNIX)
+    add_compile_options("-pthread" "-DHAS_POSIX_TIMERS")
+    target_link_libraries(miniweb dl pthread rt)
+elseif(WIN32)
+    target_link_libraries(miniweb Iphlpapi WSock32 Shell32)
+    add_compile_options("-D_CRT_SECURE_NO_WARNINGS")
+endif(UNIX)
diff --git a/Makefile.mak b/Makefile.mak
new file mode 100644
index 0000000..715a284
--- /dev/null
+++ b/Makefile.mak
@@ -0,0 +1,52 @@
+CC=cl
+LD=link
+ALLFLAGS=/O2 /W3 /Ilibctb/include /nologo /MT /DNDEBUG
+CFLAGS=$(ALLFLAGS) /TC
+CPPFLAGS=$(ALLFLAGS) /TP /EHsc
+HTTPOBJ=httppil.obj http.obj httpxml.obj httphandler.obj httppost.obj httpauth.obj loadplugin.obj
+HEADERS=httpint.h httpapi.h httpxml.h
+
+OUTDIR=bin\\
+
+DEFINES= /D_CRT_SECURE_NO_DEPRECATE /DNDEBUG /DNODEBUG /DWIN32
+LDFLAGS= WSock32.Lib shell32.lib Iphlpapi.lib
+
+!ifdef ENABLE_SERIAL
+HTTPOBJ=$(HTTPOBJ) httpserial.obj libctb/src/fifo.obj libctb/src/serportx.obj
+HEADERS=$(HEADERS) httpserial.h
+DEFINES=$(DEFINES) /Ilibctb/include
+!endif
+
+default: miniweb
+
+miniweb: miniweb.exe
+
+min: $(HTTPOBJ) httpmin.obj
+	$(LD) $(LDFLAGS) $(HTTPOBJ) httpmin.obj /OUT:$(OUTDIR)httpmin.exe
+
+miniweb.exe: $(HTTPOBJ) miniweb.obj
+	$(LD) $(LDFLAGS) $(HTTPOBJ) miniweb.obj /OUT:$(OUTDIR)miniweb.exe
+
+all : miniweb postfile plugin
+
+must_build:
+
+postfile : must_build 
+	$(CC) $(CFLAGS) $(DEFINES) /Ipostfile postfile/*.c /link $(LDFLAGS) /OUT:$(OUTDIR)postfile.exe
+
+plugin : must_build
+	$(CC) $(CFLAGS) /I. $(DEFINES) plugin/plugin.c /link $(LDFLAGS) /DLL /OUT:$(OUTDIR)plugin.dll
+
+.c.obj::
+	$(CC) $(DEFINES) $(CFLAGS) $<
+
+.cpp.obj::
+	$(CC) $(DEFINES) $(CPPFLAGS) $<
+
+clean:
+	del /Q *.obj
+	del /Q $(OUTDIR)*.exe
+	del /Q $(OUTDIR)*.obj
+	del /Q $(OUTDIR)*.dll
+	del /Q $(OUTDIR)*.lib
+
diff --git a/Plugin.md b/Plugin.md
new file mode 100644
index 0000000..255ab49
--- /dev/null
+++ b/Plugin.md
@@ -0,0 +1,36 @@
+# Miniweb plugin sytem
+To add a plugin just use a C dynamic library interface.
+See `PFNEVENTHANDLER` and `PFNEVENTHANDLER` in `loadplugin.h`
+or `httpapi.h` or example: `plugin/plugin.c`
+
+## How to write plugin
+Compile your plugin in a separate binary.
+
+The C interface:
+
+    int YourUrlHandler(UrlHandlerParam* param); // PFNURLCALLBACK
+    int YourUrlHandlerEvent(MW_EVENT msg, int argi, void* argp) // PFNEVENTHANDLER
+
+The second is optional.
+
+## Usage
+From command line:
+
+    miniweb.exe -c "myplugin:plugin.dll:MyUrlHandler|MyUrlHandlerEvent"
+
+This start the default `miniweb` but loads your plugin.
+You can have many `-c` arguments. See `miniweb -h`
+
+The plugin is registered with prefix `myplugin` which means that you can access it at http://localhost/myplugin
+
+### func1
+An other simple plugin example:
+
+    miniweb.exe -c "func1:plugin.dll:func1"
+    
+Go to http://localhost/func?v=dQw4w9WgXcQ
+
+This will parse and print the http request parameters.
+
+    [624] request path: func1?v=ZgQMW4eVrzw
+    v: "ZgQMW4eVrzw"
diff --git a/bin/htdocs/demodyn.htm b/bin/htdocs/demodyn.htm
index 4939ff8..f003234 100644
--- a/bin/htdocs/demodyn.htm
+++ b/bin/htdocs/demodyn.htm
@@ -8,7 +8,7 @@ <h1>MiniWeb Demo Page
 			<hr>
 		</P>
 		<P>
-			<iframe name="frame1" src="/~stats" scrolling="no" width="300" height="250" frameborder="0"></iframe></P>
+			<iframe name="frame1" src="/stats" scrolling="no" width="300" height="250" frameborder="0"></iframe></P>
 		<HR>
 		<script language="javascript">setInterval('frame1.location.reload()',5000);</script>
 	</body>
diff --git a/httppil.h b/httppil.h
index e829a87..2be1c5c 100644
--- a/httppil.h
+++ b/httppil.h
@@ -18,7 +18,6 @@
 #ifdef WINCE
 #include <winsock2.h>
 #include <windows.h>
-#define snprintf _snprintf
 
 #elif defined(WIN32)
 #include <winsock2.h>
@@ -26,8 +25,9 @@
 #include <windows.h>
 #include <io.h>
 
+#if _MSC_VER < 1900
 #define snprintf _snprintf
-
+#endif
 #else
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/loadplugin.c b/loadplugin.c
new file mode 100644
index 0000000..dc37cb1
--- /dev/null
+++ b/loadplugin.c
@@ -0,0 +1,126 @@
+#include "loadplugin.h"
+
+#ifdef _MSC_VER
+#   include <windows.h>
+#else
+#   include <dlfcn.h>
+#endif // _MSC_VER
+
+void* LoadDll(const char* arg)
+{
+#ifdef _MSC_VER
+    return LoadLibraryA(arg);
+#else
+    return dlopen(arg, RTLD_LAZY);
+#endif // _MSC_VER
+}
+
+int FreeDll(void* handle)
+{
+#ifdef _MSC_VER
+    return FreeLibrary((HANDLE)handle);
+#else
+    return dlclose(handle);
+#endif // _MSC_VER
+}
+
+const char* GetError()
+{
+#ifdef _MSC_VER
+    static char error[10];
+    sprintf_s(error, 10, "%d", GetLastError());
+    return error;
+#else
+    return dlerror();
+#endif // _MSC_VER
+}
+
+#ifdef _MSC_VER
+#   define GetSymbol GetProcAddress
+#else
+#   define GetSymbol dlsym
+#endif // _MSC_VER
+
+int get_handler_list_length(UrlHandler* urlHandlerList)
+{
+    int n = 0;
+    if (urlHandlerList)
+        for (n = 0; urlHandlerList[n].pchUrlPrefix; n++)
+            ;
+    return n;
+}
+
+void add_handler(UrlHandler** urlHandlerList, const char* prefix, PFNURLCALLBACK uhf, PFNEVENTHANDLER ehf)
+{
+    int n, length;
+    length = get_handler_list_length(*urlHandlerList);
+    UrlHandler* new_list = (UrlHandler*)calloc(length + 2, sizeof(UrlHandler));
+    if (new_list)
+    {
+        for (n = 0; n < length; ++n)
+        {
+            new_list[n] = (*urlHandlerList)[n];
+        }
+        new_list[n].pchUrlPrefix = prefix;
+        new_list[n].pfnUrlHandler = uhf;
+        new_list[n].pfnEventHandler = ehf;
+        new_list[n].p_sys = NULL;
+
+        new_list[n + 1].pchUrlPrefix = NULL;
+
+        free(*urlHandlerList);
+        *urlHandlerList = new_list;
+    }
+}
+
+void add_handler_from_dll(UrlHandler** urlHandlerList, const char* arg)
+{
+    char* name, *function_name, *prefix, *tmp, *event_handler_name;
+    void* library;
+    PFNEVENTHANDLER ehf = NULL;
+    PFNURLCALLBACK uhf;
+
+    name = malloc(strlen(arg) + 1);
+    strcpy(name, arg);
+    function_name = strrchr(name, ':');
+    prefix = strchr(name, ':');
+
+    if (prefix != NULL && function_name > prefix + 1)
+    {
+        *function_name = '\0';
+        ++function_name;
+        *prefix = '\0';
+        if (*function_name)
+        {
+            ++prefix;
+            tmp = prefix;
+            prefix = name;
+            name = tmp;
+            fprintf(stderr, "Loading handler... prefix: %s, dll: %s, function: %s\n", prefix, name, function_name);
+            library = LoadDll(name);
+            if (library)
+            {
+                event_handler_name = strrchr(function_name, '|');
+                if (event_handler_name)
+                {
+                    *event_handler_name++ = '\0';
+                    ehf = (PFNEVENTHANDLER)GetSymbol(library, event_handler_name);
+                }
+                uhf = (PFNURLCALLBACK)GetSymbol(library, function_name);
+                if (uhf)
+                    add_handler(urlHandlerList, prefix, uhf, ehf);
+                else
+                {
+                    fprintf(stderr, "couldn't load %s (Error: %s)!\n", function_name, GetError());
+                    FreeDll(library);
+                }
+            }
+            else
+                fprintf(stderr, "couldn't load \"%s\" (Error: %s)!\n", name, GetError());
+        }
+        else
+            fprintf(stderr, "function name shouldn't be empty in \"%s\"!\n", arg);
+    }
+    else
+        fprintf(stderr, "Two colons should be in \"%s\"!\n", arg);
+}
diff --git a/loadplugin.h b/loadplugin.h
new file mode 100644
index 0000000..f08d1be
--- /dev/null
+++ b/loadplugin.h
@@ -0,0 +1,23 @@
+#ifndef _LOADPLUGIN_H_
+#define _LOADPLUGIN_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "httpapi.h"
+
+void add_handler(UrlHandler** urlHandlerList, const char* prefix, PFNURLCALLBACK uhf, PFNEVENTHANDLER ehf);
+void add_handler_from_dll(UrlHandler** urlHandlerList, const char* arg);
+
+#ifdef __GNUC__
+#   define PLUGIN_VISIBILITY __attribute__((visibility("default")))
+#elif defined _MSC_VER
+#   define PLUGIN_VISIBILITY __declspec(dllexport)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/miniweb.c b/miniweb.c
index 3c92a81..5d86f09 100644
--- a/miniweb.c
+++ b/miniweb.c
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include "httppil.h"
 #include "httpapi.h"
+#include "loadplugin.h"
 #include "revision.h"
 #ifdef MEDIA_SERVER
 #include "mediaserver.h"
@@ -39,33 +40,6 @@ int uhAsyncDataTest(UrlHandlerParam* param);
 int uhRTSP(UrlHandlerParam* param);
 int uhSerial(UrlHandlerParam* param);
 
-UrlHandler urlHandlerList[]={
-	{"stats", uhStats, NULL},
-#ifdef ENABLE_SERIAL
-	{"serial", uhSerial, NULL},
-#endif
-#ifdef HAVE_THREAD
-	{"async", uhAsyncDataTest, NULL},
-#endif
-#ifdef MEDIA_SERVER
-	{"test.sdp", uhRTSP, NULL},
-	{"MediaServer/VideoItems/", uhMediaItemsTranscode, ehMediaItemsEvent},
-#endif
-#ifdef _7Z
-	{"7z", uh7Zip, NULL},
-#endif
-#ifdef _MPD
-	{"mpd", uhMpd, ehMpd},
-#endif
-#ifdef _VOD
-	{"vodstream", uhVodStream,NULL},
-	{"vodlib", uhLib,0},
-	{"vodplay", uhVod,ehVod},
-	{"stream", uhStream,NULL},
-#endif
-	{NULL},
-};
-
 #ifndef DISABLE_BASIC_WWWAUTH
 AuthHandler authHandlerList[]={
 	{"stats", "user", "pass", "group=admin", ""},
@@ -289,8 +263,34 @@ static int print_interfaces(const char *prefix, int port)
 
 #endif
 
+UrlHandler* urlHandlerList = NULL;
+
 int cc_main(int argc,char* argv[])
 {
+    add_handler(&urlHandlerList, "stats", uhStats, NULL);
+#ifdef ENABLE_SERIAL
+    add_handler(&urlHandlerList, "serial", uhSerial, NULL);
+#endif
+#ifdef HAVE_THREAD
+    add_handler(&urlHandlerList, "async", uhAsyncDataTest, NULL);
+#endif
+#ifdef MEDIA_SERVER
+    add_handler(&urlHandlerList, "test.sdp", uhRTSP, NULL);
+    add_handler(&urlHandlerList, "MediaServer/VideoItems/", uhMediaItemsTranscode, ehMediaItemsEvent);
+#endif
+#ifdef _7Z
+    add_handler(&urlHandlerList, "7z", uh7Zip, NULL);
+#endif
+#ifdef _MPD
+    add_handler(&urlHandlerList, "mpd", uhMpd, ehMpd);
+#endif
+#ifdef _VOD
+    add_handler(&urlHandlerList, "vodstream", uhVodStream, NULL);
+    add_handler(&urlHandlerList, "vodlib", uhLib, 0);
+    add_handler(&urlHandlerList, "vodplay", uhVod, ehVod);
+    add_handler(&urlHandlerList, "stream", uhStream, NULL);
+#endif
+
 	fprintf(stderr,"%s https://github.com/avih/miniweb (built on %s)\n"
 	               "Originally: (C)2005-2013 Written by Stanley Huang <stanleyhuangyc@gmail.com>\n\n",
 	               APP_NAME, __DATE__);
@@ -341,6 +341,9 @@ int cc_main(int argc,char* argv[])
 						       "		-s	: specifiy download speed limit in KB/s [default: none]\n"
 						       "		-n	: disallow multi-part download [default: allow]\n"
 						       "		-d	: disallow directory listing [default: allow]\n\n"
+                               "		-c	: register callback for urlHandler\n"
+                               "			: format is the following \"prefix:dll:urlhandler|eventhandler\"\n"
+                               "			: event handler is optional, prefix may be empty\n"
 						);
 					fflush(stderr);
                                         exit(1);
@@ -373,6 +376,13 @@ int cc_main(int argc,char* argv[])
 				case 'd':
 					httpParam.flags &= ~FLAG_DIR_LISTING;
 					break;
+                case 'c':
+                    if ((++i) < argc)
+                    {
+                        add_handler_from_dll(&urlHandlerList, argv[i]);
+                        httpParam.pxUrlHandler = urlHandlerList;
+                    }
+                    break;
 				}
 			}
 		}
diff --git a/miniweb.vcxproj b/miniweb.vcxproj
index c3d1a35..0310f07 100644
--- a/miniweb.vcxproj
+++ b/miniweb.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,17 +14,18 @@
     <ProjectGuid>{06E5025D-53D7-4B39-8D4C-D06E39A3023A}</ProjectGuid>
     <RootNamespace>miniweb</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -41,11 +42,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TEMP)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TEMP)\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -62,7 +63,7 @@
       <AdditionalIncludeDirectories>libctb/include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -93,7 +94,7 @@
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -117,6 +118,7 @@
     <ClCompile Include="httppil.c" />
     <ClCompile Include="httppost.c" />
     <ClCompile Include="httpxml.c" />
+    <ClCompile Include="loadplugin.c" />
     <ClCompile Include="miniweb.c" />
     <ClCompile Include="processpil.c" />
   </ItemGroup>
@@ -126,6 +128,7 @@
     <ClInclude Include="httppil.h" />
     <ClInclude Include="httpvod.h" />
     <ClInclude Include="httpxml.h" />
+    <ClInclude Include="loadplugin.h" />
     <ClInclude Include="processpil.h" />
     <ClInclude Include="revision.h" />
   </ItemGroup>
diff --git a/miniweb_vc11.sln b/miniweb_vc11.sln
deleted file mode 100644
index 153eda1..0000000
--- a/miniweb_vc11.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniweb", "miniweb.vcxproj", "{06E5025D-53D7-4B39-8D4C-D06E39A3023A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Debug|Win32.Build.0 = Debug|Win32
-		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Release|Win32.ActiveCfg = Release|Win32
-		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/miniweb_vc15.sln b/miniweb_vc15.sln
new file mode 100644
index 0000000..c6e1220
--- /dev/null
+++ b/miniweb_vc15.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2002
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniweb", "miniweb.vcxproj", "{06E5025D-53D7-4B39-8D4C-D06E39A3023A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin", "plugin\plugin.vcxproj", "{5802AFF8-6E80-4974-A7BB-D2BB73021327}"
+	ProjectSection(ProjectDependencies) = postProject
+		{06E5025D-53D7-4B39-8D4C-D06E39A3023A} = {06E5025D-53D7-4B39-8D4C-D06E39A3023A}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Debug|Win32.Build.0 = Debug|Win32
+		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Release|Win32.ActiveCfg = Release|Win32
+		{06E5025D-53D7-4B39-8D4C-D06E39A3023A}.Release|Win32.Build.0 = Release|Win32
+		{5802AFF8-6E80-4974-A7BB-D2BB73021327}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5802AFF8-6E80-4974-A7BB-D2BB73021327}.Debug|Win32.Build.0 = Debug|Win32
+		{5802AFF8-6E80-4974-A7BB-D2BB73021327}.Release|Win32.ActiveCfg = Release|Win32
+		{5802AFF8-6E80-4974-A7BB-D2BB73021327}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C5895650-EE96-4807-9DAB-A8173760D906}
+	EndGlobalSection
+EndGlobal
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
new file mode 100644
index 0000000..20d7ecc
--- /dev/null
+++ b/plugin/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required (VERSION 2.6)
+project (plugin)
+
+include_directories(${CMAKE_SOURCE_DIR})
+
+add_library(plugin SHARED plugin.c)
diff --git a/plugin/plugin.c b/plugin/plugin.c
new file mode 100644
index 0000000..c0d7da9
--- /dev/null
+++ b/plugin/plugin.c
@@ -0,0 +1,149 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#include <fcntl.h>  
+
+#include "loadplugin.h"
+
+char* mwGetVarValue(HttpVariables* vars, const char *varname, const char *defval)
+{
+    int i;
+    if (vars && varname) {
+        for (i = 0; (vars + i)->name; i++) {
+            if (!strcmp((vars + i)->name, varname)) {
+                return (vars + i)->value;
+            }
+        }
+    }
+    return (char*)defval;
+}
+
+PLUGIN_VISIBILITY int func1(UrlHandlerParam* hp)
+{
+    int ret = 0;
+    int i;
+    for (i = 0; i < hp->iVarCount; ++i)
+        printf("%s: \"%s\"\n", hp->pxVars[i].name, hp->pxVars[i].value);
+    return ret;
+}
+
+static HttpParam httpParam;
+
+static int fdStream;
+
+//#ifdef __GNUC__
+//#   define _O_BINARY 0
+//#endif
+//
+//PLUGIN_VISIBILITY int StreamHandlerEvent(MW_EVENT msg, int argi, void* argp)
+//{
+//    switch (msg) {
+//    case MW_INIT:
+//        fdStream = open("test.txt", O_BINARY | O_RDONLY);
+//        break;
+//    case MW_UNINIT:
+//        _close(fdStream);
+//        break;
+//    }
+//    return 0;
+//}
+//
+//PLUGIN_VISIBILITY int StreamHandler(UrlHandlerParam* param)
+//{
+//    param->dataBytes = _read(fdStream, param->pucBuffer, param->dataBytes);
+//    param->fileType = HTTPFILETYPE_TEXT;
+//    return FLAG_DATA_STREAM | FLAG_CONN_CLOSE;
+//}
+//
+struct {
+    int ethif;
+    char ip[16];
+    int mode;
+    char tvmode[4];
+} cfgdata;
+
+PLUGIN_VISIBILITY int MyUrlHandlerEvent(MW_EVENT msg, int argi, void* argp)
+{
+    switch (msg) {
+    case MW_INIT:
+        memset(&cfgdata, 0, sizeof(cfgdata));
+        strcpy(cfgdata.ip, "192.168.0.100");
+        cfgdata.tvmode[0] = 1;
+        cfgdata.tvmode[1] = 1;
+        break;
+    case MW_UNINIT:
+        //nothing to uninit
+        break;
+    }
+    return 0;	//0 on success, -1 on failure
+}
+
+PLUGIN_VISIBILITY int MyUrlHandler(UrlHandlerParam* param)
+{
+    static const char *html_head = "<html><body><h2 align='center'>STB Configuration</h2><hr>";
+    static const char *html_form_start = "<form method='get' action='/myplugin'>";
+    static const char *html_ethif[] = {
+        "Network Interface: <input type='radio' value='0' name='if'%s>DHCP ",
+        "<input type='radio' name='if' value='1'%s>PPPoE ",
+        "<input type='radio' name='if' value='2'%s>Static IP: " };
+    static const char *html_ip = "<input type='text' name='ip' size='20' value='%s'></p>";
+    static const char *html_mode[] = {
+        "<p>Startup Mode: <select size='1' name='mode'><option value='0'%s>TV Mode</option>",
+        "<option value='1'%s>VOD Mode</option>",
+        "<option value='2'%s>Storage Mode</option></select></p>" };
+    static const char *html_tvmode[] = {
+        "<p>TV Mode Supported: <input type='checkbox' name='m0' value='1'%s>PAL ",
+        "<input type='checkbox' name='m1' value='1'%s>NTSC ",
+        "<input type='checkbox' name='m2' value='1'%s>720p ",
+        "<input type='checkbox' name='m3' value='1'%s>1080i</p>" };
+    static const char *html_form_end = "<p><input type='submit' value='Submit' name='B1'><input type='reset' value='Reset' name='B2'></p></form><hr>";
+    static const char *html_tail = "</body></html>";
+    static const char *tvmodes[] = { "PAL", "NTSC", "720p", "1080i" };
+    char *p = param->pucBuffer, *v;
+    int i;
+
+    if (param->pxVars) {
+        // processing settings
+        if ((v = mwGetVarValue(param->pxVars, "if", 0)))
+            cfgdata.ethif = atoi(v);
+        if ((v = mwGetVarValue(param->pxVars, "mode", 0)))
+            cfgdata.mode = atoi(v);
+        if ((v = mwGetVarValue(param->pxVars, "ip", 0)))
+            strcpy(cfgdata.ip, v);
+        for (i = 0; i < 4; i++) {
+            char buf[4];
+            sprintf(buf, "m%d", i);
+            cfgdata.tvmode[i] = mwGetVarValue(param->pxVars, buf, 0) ? 1 : 0;
+        }
+        // print new settings in console
+        printf("\n--- Configuration ---\nNetwork Interface: %d\n", cfgdata.ethif);
+        if (cfgdata.ethif == 2) printf("IP: %s\n", cfgdata.ip);
+        printf("Startup Mode: %d\nTV Modes:", cfgdata.mode);
+        for (i = 0; i < 4; i++) {
+            if (cfgdata.tvmode[i]) printf(" %s", tvmodes[i]);
+        }
+        printf("\n---------------------\n\n");
+    }
+
+    p += sprintf(p, "%s%s", html_head, html_form_start);
+    for (i = 0; i < 3; i++) {
+        p += sprintf(p, html_ethif[i], (cfgdata.ethif == i) ? " checked" : "");
+    }
+    p += sprintf(p, html_ip, cfgdata.ip);
+    for (i = 0; i < 3; i++) {
+        p += sprintf(p, html_mode[i], (cfgdata.mode == i) ? " selected" : "");
+    }
+    for (i = 0; i < 4; i++) {
+        p += sprintf(p, html_tvmode[i], cfgdata.tvmode[i] ? " checked" : "");
+    }
+    p += sprintf(p, "%s%s%s", html_form_end, param->pxVars ? "<p>New settings applied</p>" : "", html_tail);
+    param->dataBytes = (int)(p - (param->pucBuffer));
+    param->fileType = HTTPFILETYPE_HTML;
+    return FLAG_DATA_RAW;
+}
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
diff --git a/plugin/plugin.vcxproj b/plugin/plugin.vcxproj
new file mode 100644
index 0000000..4ecd438
--- /dev/null
+++ b/plugin/plugin.vcxproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="plugin.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{5802AFF8-6E80-4974-A7BB-D2BB73021327}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>plugin</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$bin</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$bin</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;PLUGIN_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <CompileAs>CompileAsC</CompileAs>
+      <AdditionalIncludeDirectories>$(SolutionDir);C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;PLUGIN_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <CompileAs>CompileAsC</CompileAs>
+      <AdditionalIncludeDirectories>$(SolutionDir);C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/plugin/plugin.vcxproj.filters b/plugin/plugin.vcxproj.filters
new file mode 100644
index 0000000..bb3c188
--- /dev/null
+++ b/plugin/plugin.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="plugin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/plugin/plugin.vcxproj.user b/plugin/plugin.vcxproj.user
new file mode 100644
index 0000000..6e2aec7
--- /dev/null
+++ b/plugin/plugin.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/processpil.c b/processpil.c
index d10b80b..67bc9eb 100644
--- a/processpil.c
+++ b/processpil.c
@@ -7,7 +7,9 @@
 #ifdef WIN32
 #include <windows.h>
 #include <io.h>
+#if _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #else
 #include <unistd.h>
 #include <sys/time.h>
diff --git a/win32/win_compat.h b/win32/win_compat.h
index 214977f..eb22e10 100644
--- a/win32/win_compat.h
+++ b/win32/win_compat.h
@@ -155,7 +155,7 @@ static wchar_t *mp_from_utf8(const char *s)
     int count = MultiByteToWideChar(CP_UTF8, 0, s, -1, NULL, 0);
     if (count <= 0)
         return NULL;
-    wchar_t *ret = malloc(sizeof(wchar_t) * (count + 1));
+    wchar_t *ret = (wchar_t*)malloc(sizeof(wchar_t) * (count + 1));
     MultiByteToWideChar(CP_UTF8, 0, s, -1, ret, count);
     return ret;
 }
@@ -172,7 +172,7 @@ static char *mp_to_utf8(const wchar_t *s)
     int count = _cc_WCTU8(0, s, 0);
     if (count <= 0)
         return NULL;
-    char *ret = malloc(sizeof(char) * count);
+    char *ret = (char*)malloc(sizeof(char) * count);
     _cc_WCTU8(ret, s, count);
     return ret;
 }
@@ -211,7 +211,7 @@ static int mp_vfprintf(FILE *f, const char *format, va_list args)
 
     if (h != INVALID_HANDLE_VALUE) {
         size_t len = vsnprintf(NULL, 0, format, args) + 1;
-        char *buf = malloc(sizeof(char) * len);
+        char *buf = (char*)malloc(sizeof(char) * len);
 
         if (buf) {
             rv = vsnprintf(buf, len, format, args);
@@ -240,7 +240,7 @@ static char **cc_get_argvutf8(int argc_validation, char **argv_orig, int *out_su
         return argv_orig;
     }
 
-    char **argvu = malloc(sizeof(char*) * (nArgs + 1));
+    char **argvu = (char**)malloc(sizeof(char*) * (nArgs + 1));
     int i;
     for (i = 0; i < nArgs; i++) {
         argvu[i] = mp_to_utf8(szArglist[i]);