diff --git a/Espresso.sln b/Espresso.sln
index 79da7f57..0f15e340 100644
--- a/Espresso.sln
+++ b/Espresso.sln
@@ -43,6 +43,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NodeJsEngineHelper", "Tests
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestNode01_NetworkClients", "Tests\TestNode01_NetworkClients\TestNode01_NetworkClients.csproj", "{3D1E03EB-863D-4B02-9021-C69805C73F7C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libespr", "libespresso\libespresso.vcxproj", "{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Tests\NodeJsEngineHelper\NodeJsEngineHelper.projitems*{25c800d8-d92c-4ee9-9512-3fe928e2b6c4}*SharedItemsImports = 13
@@ -346,6 +348,24 @@ Global
 		{3D1E03EB-863D-4B02-9021-C69805C73F7C}.Release|x64.Build.0 = Release|Any CPU
 		{3D1E03EB-863D-4B02-9021-C69805C73F7C}.Release|x86.ActiveCfg = Release|Any CPU
 		{3D1E03EB-863D-4B02-9021-C69805C73F7C}.Release|x86.Build.0 = Release|Any CPU
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|Win32.Build.0 = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x64.ActiveCfg = Debug|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x64.Build.0 = Debug|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x86.ActiveCfg = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x86.Build.0 = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|Any CPU.ActiveCfg = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|Win32.ActiveCfg = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|Win32.Build.0 = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x64.ActiveCfg = Release|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x64.Build.0 = Release|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x86.ActiveCfg = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index df9c01a3..61739bb1 100755
--- a/README.md
+++ b/README.md
@@ -1,3 +1,14 @@
+Espresso Modified by John Chen
+===============
+Modified to build with the latest version of Nuget-V8 (7.4.288.11). NodeJS support dropped. 
+
+License:
+MIT, 2013, Federico Di Gregorio fog@initd.org, https://github.com/fogzot/vroomjs
+
+MIT, 2015-2019, WinterDev
+
+MIT, 2019, John Chen
+
 Espresso / Espresso-VE / Espresso-ND
 ===============
 
diff --git a/build/Net20/EspressoCore/0_Start/JsBridgeForNet20.cs b/build/Net20/EspressoCore/0_Start/JsBridgeForNet20.cs
index 3c7e20ff..39d8d847 100644
--- a/build/Net20/EspressoCore/0_Start/JsBridgeForNet20.cs
+++ b/build/Net20/EspressoCore/0_Start/JsBridgeForNet20.cs
@@ -1,5 +1,6 @@
 //MIT, 2015-present, WinterDev, EngineKit, brezza92
 using System;
+using System.IO;
 using System.Runtime.InteropServices;
 namespace Espresso
 {
@@ -19,7 +20,7 @@ public static void LoadV8(string dllfile, bool doV8Init = true)
             if (doV8Init)
             {
                 //sometime we set to false , and  let underlying lib init the v8 engine.
-                NativeV8JsInterOp.V8Init();
+                NativeV8JsInterOp.V8Init(Path.GetDirectoryName(dllfile));
             }
         }
 
diff --git a/build/Net20/EspressoCore/EspressoCore.csproj b/build/Net20/EspressoCore/EspressoCore.csproj
index 9a017eab..1a61c35c 100644
--- a/build/Net20/EspressoCore/EspressoCore.csproj
+++ b/build/Net20/EspressoCore/EspressoCore.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EspressoCore</RootNamespace>
     <AssemblyName>EspressoCore</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,7 +22,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +44,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -51,6 +55,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/build/Net20/SandBox2/SandBox2.csproj b/build/Net20/SandBox2/SandBox2.csproj
index 540859c0..a25d0191 100644
--- a/build/Net20/SandBox2/SandBox2.csproj
+++ b/build/Net20/SandBox2/SandBox2.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,11 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SandBox2</RootNamespace>
     <AssemblyName>SandBox2</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -22,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -31,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -50,6 +53,9 @@
       <Name>EspressoCore</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
diff --git a/build/Net20/SandBox2/Sandbox.cs b/build/Net20/SandBox2/Sandbox.cs
index 0e041f6c..9d165af6 100644
--- a/build/Net20/SandBox2/Sandbox.cs
+++ b/build/Net20/SandBox2/Sandbox.cs
@@ -32,9 +32,9 @@ namespace Sandbox
 
     public class debugtest
     {
-        public int TestProp { get; set; }
+        public static int TestProp { get; set; }
 
-        public static bool BoolTest(int a, int b)
+        public bool BoolTest(int a, int b)
         {
             return a == b;
         }
@@ -64,15 +64,17 @@ class Sandbox
     {
         public static void Main(string[] args)
         {
-            // string lodash = File.ReadAllText(@"c:\lodash.js");
-            using (JsEngine engine = new JsEngine())
+			// string lodash = File.ReadAllText(@"c:\lodash.js");
+			Espresso.JsBridge.V8Init(Environment.CurrentDirectory + "\\");
+			using (JsEngine engine = new JsEngine())
             {
                 //Stopwatch watch = new Stopwatch();
                 //	watch.Start();
                 JsScript script = engine.CompileScript("3+3", "<unnamed>");
                 using (JsContext ctx = engine.CreateContext())
                 {
-                    ctx.Execute(script);
+					object result = ctx.Execute(script);
+					Console.WriteLine(result);
                 }
             }
 
@@ -88,12 +90,12 @@ public static void Main(string[] args)
                 {
                     using (JsContext context = js.CreateContext())
                     {
-                        //context.SetVariable("dbg", dbg);
+                        context.SetVariableFromAny("dbg", dbg);
                         //object result = context.Execute("dbg.Write(dbg.valueOf());");
                         context.SetVariableFromAny("Debug", typeof(debugtest));
 
-                        object result = context.Execute("Debug.BoolTest(3,4);");
-
+                        object result = context.Execute("Debug.TestProp;");
+						Console.WriteLine(result);
                     }
                     GC.Collect();
                     js.DumpHeapStats();
diff --git a/libespresso/bridge2.h b/libespresso/bridge2.h
index 3f8eb633..1660d4de 100644
--- a/libespresso/bridge2.h
+++ b/libespresso/bridge2.h
@@ -25,7 +25,7 @@ typedef void(CALLINGCONVENTION* del_engineClosingCb)(JsEngine* jsEngine, JsConte
 extern "C" {
 
 	EXPORT int TestCallBack();
-	EXPORT void V8Init();
+	EXPORT void V8Init(char* location);
 	//---------------------------------------------------------------------
 	//for managed code to register its callback method
 	EXPORT void RegisterManagedCallback(void* callback, int callBackKind);
diff --git a/libespresso/bridge2_impl.cpp b/libespresso/bridge2_impl.cpp
index 2cf46bb3..343fae1d 100644
--- a/libespresso/bridge2_impl.cpp
+++ b/libespresso/bridge2_impl.cpp
@@ -8,6 +8,8 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 using namespace std;
 using namespace v8;
+
+#include "espresso.h"
 #include "bridge2.h"
 
 del02 managedListner; //for debug 
@@ -100,7 +102,8 @@ ManagedRef* JsContext::CreateWrapperForManagedObject(int mIndex, ExternalTypeDef
 	{
 
 		Local<ObjectTemplate> objTemplate = Local<ObjectTemplate>::New(isolate_, externalTypeDef->handlerToJsObjectTemplate);
-		Local<Object> instance = objTemplate->NewInstance();
+		Local<Object> instance;
+		objTemplate->NewInstance(ctx).ToLocal(&instance);
 		handler->v8InstanceHandler.Reset(isolate_, instance);
 		Local<Object> hd = Local<v8::Object>::New(isolate_, handler->v8InstanceHandler);
 		hd->SetInternalField(0, External::New(isolate_, handler));
@@ -384,11 +387,17 @@ int ArgCount(MetCallingArgs* args)
 //======================================================  
 
 static v8::Platform* default_platform;
-void V8Init()
+static bool Initialized = false;
+
+void V8Init(char* location)
 {
+	if (Initialized) return;
 	const int thread_pool_size = 4;
 	/*auto p = V8::*/
-	default_platform = v8::platform::CreateDefaultPlatform(thread_pool_size);
+	v8::V8::InitializeICUDefaultLocation(location);
+	v8::V8::InitializeExternalStartupData(location);
+	default_platform = v8::platform::NewDefaultPlatform(thread_pool_size).release();
 	V8::InitializePlatform(default_platform);
 	V8::Initialize();
+	Initialized = true;
 }
diff --git a/libespresso/jscontext.cpp b/libespresso/jscontext.cpp
index dc35105e..77edce3e 100644
--- a/libespresso/jscontext.cpp
+++ b/libespresso/jscontext.cpp
@@ -43,8 +43,12 @@ JsContext* JsContext::New(int id, JsEngine* engine) {
     Locker locker(context->isolate_);
     Isolate::Scope isolate_scope(context->isolate_);
     HandleScope scope(context->isolate_);
+
+	auto current = Context::New(context->isolate_);
+	current->Global()->Set(current, String::NewFromUtf8(context->isolate_, "global"), current->Global());
+
     context->context_ = new Persistent<Context>(
-        context->isolate_, Context::New(context->isolate_));
+        context->isolate_, current);
   }
   return context;
 }
@@ -151,7 +155,8 @@ void JsContext::SetVariable(const uint16_t* name,
   if (ctx->Global()->Set(String::NewFromTwoByte(isolate_, name), v) ==
       false) {  // 0.12.x
     // TODO: Return an error if set failed.
-  }
+	  ctx->Exit();
+  } else
 
   ctx->Exit();
 
@@ -208,7 +213,7 @@ void JsContext::GetPropertyNames(Persistent<Object>* obj, jsvalue* output) {
   TryCatch trycatch(isolate_);
 
   Local<Object> objLocal = Local<Object>::New(isolate_, *obj);
-  Local<Value> value = objLocal->GetPropertyNames();
+  Local<Value> value = objLocal->GetPropertyNames(ctx).ToLocalChecked();
   if (!value.IsEmpty()) {
     engine_->AnyFromV8(value, Handle<Object>(), output);
   } else {
@@ -294,7 +299,7 @@ void JsContext::InvokeFunction(Persistent<Function>* func,
     // TODO: Check ArrayToV8Args return value (but right now can't fail, right?)
     Local<Function> func = Local<Function>::Cast(prop);
     Local<Value> value =
-        func->Call(reciever, args->i32, &argv[0]);  // i32 as length
+        func->Call(ctx, reciever, args->i32, &argv[0]).ToLocalChecked();  // i32 as length
     if (!value.IsEmpty()) {
       engine_->AnyFromV8(value, Handle<Object>(), output);
     } else {
@@ -331,7 +336,7 @@ void JsContext::InvokeProperty(Persistent<Object>* obj,
     Local<Function> func = Local<Function>::Cast(prop);
 
     Local<Value> value =
-        func->Call(objLocal, args->i32, &argv[0]);  // i32 as length
+        func->Call(ctx, objLocal, args->i32, &argv[0]).ToLocalChecked();  // i32 as length
     if (!value.IsEmpty()) {
       engine_->AnyFromV8(value, Handle<Object>(), output);
     } else {
diff --git a/libespresso/jsengine.cpp b/libespresso/jsengine.cpp
index c6087dda..3fe43711 100644
--- a/libespresso/jsengine.cpp
+++ b/libespresso/jsengine.cpp
@@ -8,7 +8,7 @@
 long js_mem_debug_engine_count;
 
 extern "C" void CALLCONV jsvalue_alloc_array(const int32_t length,
-                                             jsvalue* output);
+	jsvalue* output);
 
 static const int Mega = 1024 * 1024;
 
@@ -16,17 +16,17 @@ static const int Mega = 1024 * 1024;
 //    Local<Name> property, const PropertyCallbackInfo<Value>& info);
 
 static void managed_prop_get(Local<Name> name,
-                             const PropertyCallbackInfo<Value>& info) {
+	const PropertyCallbackInfo<Value>& info) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_prop_get" << std::endl;
+	std::cout << "managed_prop_get" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  EscapableHandleScope scope(isolate);
+	Isolate* isolate = Isolate::GetCurrent();
+	EscapableHandleScope scope(isolate);
 
-  Local<Object> self = info.Holder();
-  Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value(); 
-  info.GetReturnValue().Set(ref->GetPropertyValue(name->ToString()));
+	Local<Object> self = info.Holder();
+	Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	info.GetReturnValue().Set(ref->GetPropertyValue(name->ToString(isolate)));
 }
 
 // typedef void (*GenericNamedPropertySetterCallback)(
@@ -35,667 +35,673 @@ static void managed_prop_get(Local<Name> name,
 //    const PropertyCallbackInfo<Value>& info);
 
 static void managed_prop_set(Local<Name> name,
-                             Local<Value> value,
-                             const PropertyCallbackInfo<Value>& info) {
+	Local<Value> value,
+	const PropertyCallbackInfo<Value>& info) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_prop_set" << std::endl;
+	std::cout << "managed_prop_set" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  EscapableHandleScope scope(isolate);
-
-  Local<Object> self = info.Holder();
-  Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  if (ref == NULL) {
-    Local<Value> result;
-    info.GetReturnValue().Set(result);
-  }
-  info.GetReturnValue().Set(
-      Local<Value>::New(isolate, ref->SetPropertyValue(name->ToString(), value)));
+	Isolate* isolate = Isolate::GetCurrent();
+	EscapableHandleScope scope(isolate);
+
+	Local<Object> self = info.Holder();
+	Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	if (ref == NULL) {
+		Local<Value> result;
+		info.GetReturnValue().Set(result);
+	}
+	info.GetReturnValue().Set(
+		Local<Value>::New(isolate, ref->SetPropertyValue(name->ToString(isolate), value)));
 }
 
 static void managed_prop_delete(Local<Name> name,
-                                const PropertyCallbackInfo<Boolean>& info) {
+	const PropertyCallbackInfo<Boolean>& info) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_prop_delete" << std::endl;
+	std::cout << "managed_prop_delete" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  EscapableHandleScope scope(isolate);
-
-  Local<Object> self = info.Holder();
-  Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  info.GetReturnValue().Set(
-      Local<Boolean>::New(isolate, ref->DeleteProperty(name->ToString())));
+	Isolate* isolate = Isolate::GetCurrent();
+	EscapableHandleScope scope(isolate);
+
+	Local<Object> self = info.Holder();
+	Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	info.GetReturnValue().Set(
+		Local<Boolean>::New(isolate, ref->DeleteProperty(name->ToString(isolate))));
 }
 
 static void managed_prop_enumerate(const PropertyCallbackInfo<Array>& info) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_prop_enumerate" << std::endl;
+	std::cout << "managed_prop_enumerate" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  EscapableHandleScope scope(isolate);
-
-  Local<Object> self = info.Holder();
-  Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  info.GetReturnValue().Set(
-      Local<Array>::New(isolate, ref->EnumerateProperties()));
+	Isolate* isolate = Isolate::GetCurrent();
+	EscapableHandleScope scope(isolate);
+
+	Local<Object> self = info.Holder();
+	Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	info.GetReturnValue().Set(
+		Local<Array>::New(isolate, ref->EnumerateProperties()));
 }
 
- 
+
 
 static void managed_call(const FunctionCallbackInfo<v8::Value>& args) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_call" << std::endl;
+	std::cout << "managed_call" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  EscapableHandleScope scope(isolate);
-
-  Local<Object> self = args.Holder();
-  Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  args.GetReturnValue().Set(
-      scope.Escape(Local<Value>::New(isolate, ref->Invoke(args))));
+	Isolate* isolate = Isolate::GetCurrent();
+	EscapableHandleScope scope(isolate);
+
+	Local<Object> self = args.Holder();
+	Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	args.GetReturnValue().Set(
+		scope.Escape(Local<Value>::New(isolate, ref->Invoke(args))));
 }
 
 void managed_valueof(const FunctionCallbackInfo<Value>& args) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_valueof" << std::endl;
+	std::cout << "managed_valueof" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  EscapableHandleScope scope(isolate);
+	Isolate* isolate = Isolate::GetCurrent();
+	EscapableHandleScope scope(isolate);
 
-  Local<Object> self = args.Holder();
-  Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  args.GetReturnValue().Set(Local<Value>::New(isolate, ref->GetValueOf()));
+	Local<Object> self = args.Holder();
+	Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	args.GetReturnValue().Set(Local<Value>::New(isolate, ref->GetValueOf()));
 }
 
 // from nodejs---------------
 class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
- public:
-  // ArrayBufferAllocator() :  { }
+public:
+	// ArrayBufferAllocator() :  { }
 
-  // inline void set_env(Environment* env) { env_ = env; }
-  // Defined in src/node.cc
-  virtual void* Allocate(size_t size);
-  virtual void* AllocateUninitialized(size_t size) { return malloc(size); }
-  virtual void Free(void* data, size_t) { free(data); }
+	// inline void set_env(Environment* env) { env_ = env; }
+	// Defined in src/node.cc
+	virtual void* Allocate(size_t size);
+	virtual void* AllocateUninitialized(size_t size) { return malloc(size); }
+	virtual void Free(void* data, size_t) { free(data); }
 
- private:
-  // Environment* env_;
+private:
+	// Environment* env_;
 };
 
 void* ArrayBufferAllocator::Allocate(size_t size) {
-  return calloc(size, 1);
-  /*if (env_ == nullptr || !env_->array_buffer_allocator_info()->no_zero_fill())
-  return calloc(size, 1);
-  env_->array_buffer_allocator_info()->reset_fill_flag();
-  return malloc(size);*/
+	return calloc(size, 1);
+	/*if (env_ == nullptr || !env_->array_buffer_allocator_info()->no_zero_fill())
+	return calloc(size, 1);
+	env_->array_buffer_allocator_info()->reset_fill_flag();
+	return malloc(size);*/
 }
 //----------------------
 //----------------------
 JsEngine* JsEngine::NewFromExistingIsolate(v8::Isolate* isolate) {
-  // create engine from existing context
-  JsEngine* engine = new JsEngine();
-  if (engine == NULL) {
-    // eg memory error
-    return NULL;
-  }
-  engine->isolate_ = isolate;
-  Locker locker(engine->isolate_);
-  Isolate::Scope isolate_scope(engine->isolate_);
-  HandleScope scope(engine->isolate_);
-  auto context_n = Context::New(engine->isolate_);
-  // Setup the template we'll use for all managed object references.
-  // FunctionCallback callback;
-  Handle<FunctionTemplate> fo = FunctionTemplate::New(engine->isolate_, NULL);
-  Handle<ObjectTemplate> obj_template = fo->InstanceTemplate();
-  obj_template->SetInternalFieldCount(1);
-
-  /*NamedPropertyHandlerConfiguration namedPropHandlerConf(
-      managed_prop_get,
-      managed_prop_set,
-      nullptr,
-      managed_prop_delete,
-      managed_prop_enumerate);*/
-
-  obj_template->SetHandler(
-      NamedPropertyHandlerConfiguration(managed_prop_get,
-                                        managed_prop_set,
-                                        nullptr,
-                                        managed_prop_delete,
-                                        managed_prop_enumerate));
-
-  /*obj_template->SetNamedPropertyHandler(
-          managed_prop_get,
-          managed_prop_set,
-          NULL,
-          managed_prop_delete,
-          managed_prop_enumerate);*/
-
-  obj_template->SetCallAsFunctionHandler(managed_call);
-  engine->managed_template_ =
-      new Persistent<FunctionTemplate>(engine->isolate_, fo);
-
-  Local<FunctionTemplate> ff =
-      FunctionTemplate::New(engine->isolate_, managed_valueof);
-  Persistent<FunctionTemplate> fp;
-  fp.Reset(engine->isolate_, ff);
-  engine->valueof_function_template_ =
-      new Persistent<FunctionTemplate>(engine->isolate_, fp);
-
-  engine->global_context_ =
-      new Persistent<Context>(engine->isolate_, Context::New(engine->isolate_));
-  Local<Context> ctx =
-      Local<Context>::New(engine->isolate_, *engine->global_context_);
-  ctx->Enter();
-  fo->PrototypeTemplate()->Set(String::NewFromUtf8(engine->isolate_, "valueOf"),
-                               ff);
-  ctx->Exit();
-
-  return engine;
+	// create engine from existing context
+	JsEngine* engine = new JsEngine();
+	if (engine == NULL) {
+		// eg memory error
+		return NULL;
+	}
+	engine->isolate_ = isolate;
+	Locker locker(engine->isolate_);
+	Isolate::Scope isolate_scope(engine->isolate_);
+	HandleScope scope(engine->isolate_);
+	auto context_n = Context::New(engine->isolate_);
+	// Setup the template we'll use for all managed object references.
+	// FunctionCallback callback;
+	Handle<FunctionTemplate> fo = FunctionTemplate::New(engine->isolate_, NULL);
+	Handle<ObjectTemplate> obj_template = fo->InstanceTemplate();
+	obj_template->SetInternalFieldCount(1);
+
+	/*NamedPropertyHandlerConfiguration namedPropHandlerConf(
+		managed_prop_get,
+		managed_prop_set,
+		nullptr,
+		managed_prop_delete,
+		managed_prop_enumerate);*/
+
+	obj_template->SetHandler(
+		NamedPropertyHandlerConfiguration(managed_prop_get,
+			managed_prop_set,
+			nullptr,
+			managed_prop_delete,
+			managed_prop_enumerate));
+
+	/*obj_template->SetNamedPropertyHandler(
+			managed_prop_get,
+			managed_prop_set,
+			NULL,
+			managed_prop_delete,
+			managed_prop_enumerate);*/
+
+	obj_template->SetCallAsFunctionHandler(managed_call);
+	engine->managed_template_ =
+		new Persistent<FunctionTemplate>(engine->isolate_, fo);
+
+	Local<FunctionTemplate> ff =
+		FunctionTemplate::New(engine->isolate_, managed_valueof);
+	Persistent<FunctionTemplate> fp;
+	fp.Reset(engine->isolate_, ff);
+	engine->valueof_function_template_ =
+		new Persistent<FunctionTemplate>(engine->isolate_, fp);
+
+	engine->global_context_ =
+		new Persistent<Context>(engine->isolate_, Context::New(engine->isolate_));
+	Local<Context> ctx =
+		Local<Context>::New(engine->isolate_, *engine->global_context_);
+	ctx->Enter();
+	fo->PrototypeTemplate()->Set(String::NewFromUtf8(engine->isolate_, "valueOf"),
+		ff);
+	ctx->Exit();
+
+	return engine;
 }
 //----------------------
 JsEngine* JsEngine::New(int32_t max_young_space = -1,
-                        int32_t max_old_space = -1) {
-  JsEngine* engine = new JsEngine();
-  if (engine == NULL) {
-    // eg memory error
-    return NULL;
-  }
-  //---------------------------------------------------
-  Isolate::CreateParams params;
-  ArrayBufferAllocator* array_buffer_allocator = new ArrayBufferAllocator();
-  params.array_buffer_allocator = array_buffer_allocator;
-  engine->isolate_ = Isolate::New(params);  //
-
-  //-------------------------------------------------
-  // engine->isolate_->Enter();
-  ////if (max_young_space > 0 && max_old_space > 0) {
-  ////	v8::ResourceConstraints constraints;
-  ////	//constraints.set_max_young_space_size(max_young_space * Mega);//0.10.x
-  ////	constraints.set_max_semi_space_size(max_young_space * Mega);//0.12.x
-  ////	constraints.set_max_old_space_size(max_old_space * Mega);
-  ////
-  ////	//v8::SetResourceConstraints(&constraints); //0.10.x
-  //// 	//v8::SetResourceConstraints(engine->isolate_, &constraints); //0.12.x
-  ////
-  ////
-  ////}
-  // engine->isolate_->Exit();
-  //--------------------------------------------------
-
-  Locker locker(engine->isolate_);
-  Isolate::Scope isolate_scope(engine->isolate_);
-  HandleScope scope(engine->isolate_);
-  auto context_n = Context::New(engine->isolate_);
-  // Setup the template we'll use for all managed object references.
-
-  Handle<FunctionTemplate> fo = FunctionTemplate::New(engine->isolate_, NULL);
-  Handle<ObjectTemplate> obj_template = fo->InstanceTemplate();
-  obj_template->SetInternalFieldCount(1);
-
-  obj_template->SetHandler(
-      NamedPropertyHandlerConfiguration(managed_prop_get,
-                                        managed_prop_set,
-                                        NULL,
-                                        managed_prop_delete,
-                                        managed_prop_enumerate));
-
-  obj_template->SetCallAsFunctionHandler(managed_call);
-  engine->managed_template_ =
-      new Persistent<FunctionTemplate>(engine->isolate_, fo);
-
-  Local<FunctionTemplate> ff =
-      FunctionTemplate::New(engine->isolate_, managed_valueof);
-  Persistent<FunctionTemplate> fp;
-  fp.Reset(engine->isolate_, ff);
-  engine->valueof_function_template_ =
-      new Persistent<FunctionTemplate>(engine->isolate_, fp);
-
-  engine->global_context_ =
-      new Persistent<Context>(engine->isolate_, Context::New(engine->isolate_));
-  Local<Context> ctx =
-      Local<Context>::New(engine->isolate_, *engine->global_context_);
-  ctx->Enter();
-  fo->PrototypeTemplate()->Set(String::NewFromUtf8(engine->isolate_, "valueOf"),
-                               ff);
-  ctx->Exit();
-
-  return engine;
+	int32_t max_old_space = -1) {
+	JsEngine* engine = new JsEngine();
+	if (engine == NULL) {
+		// eg memory error
+		return NULL;
+	}
+	//---------------------------------------------------
+	Isolate::CreateParams params;
+	ArrayBufferAllocator* array_buffer_allocator = new ArrayBufferAllocator();
+	params.array_buffer_allocator = array_buffer_allocator;
+	engine->isolate_ = Isolate::New(params);  //
+
+	//-------------------------------------------------
+	// engine->isolate_->Enter();
+	////if (max_young_space > 0 && max_old_space > 0) {
+	////	v8::ResourceConstraints constraints;
+	////	//constraints.set_max_young_space_size(max_young_space * Mega);//0.10.x
+	////	constraints.set_max_semi_space_size(max_young_space * Mega);//0.12.x
+	////	constraints.set_max_old_space_size(max_old_space * Mega);
+	////
+	////	//v8::SetResourceConstraints(&constraints); //0.10.x
+	//// 	//v8::SetResourceConstraints(engine->isolate_, &constraints); //0.12.x
+	////
+	////
+	////}
+	// engine->isolate_->Exit();
+	//--------------------------------------------------
+
+	Locker locker(engine->isolate_);
+	Isolate::Scope isolate_scope(engine->isolate_);
+	HandleScope scope(engine->isolate_);
+	auto context_n = Context::New(engine->isolate_);
+	// Setup the template we'll use for all managed object references.
+
+	Handle<FunctionTemplate> fo = FunctionTemplate::New(engine->isolate_, NULL);
+	Handle<ObjectTemplate> obj_template = fo->InstanceTemplate();
+	obj_template->SetInternalFieldCount(1);
+
+	obj_template->SetHandler(
+		NamedPropertyHandlerConfiguration(managed_prop_get,
+			managed_prop_set,
+			NULL,
+			managed_prop_delete,
+			managed_prop_enumerate));
+
+	obj_template->SetCallAsFunctionHandler(managed_call);
+	engine->managed_template_ =
+		new Persistent<FunctionTemplate>(engine->isolate_, fo);
+
+	Local<FunctionTemplate> ff =
+		FunctionTemplate::New(engine->isolate_, managed_valueof);
+	Persistent<FunctionTemplate> fp;
+	fp.Reset(engine->isolate_, ff);
+	engine->valueof_function_template_ =
+		new Persistent<FunctionTemplate>(engine->isolate_, fp);
+
+	engine->global_context_ =
+		new Persistent<Context>(engine->isolate_, Context::New(engine->isolate_));
+	Local<Context> ctx =
+		Local<Context>::New(engine->isolate_, *engine->global_context_);
+	ctx->Enter();
+	fo->PrototypeTemplate()->Set(String::NewFromUtf8(engine->isolate_, "valueOf"),
+		ff);
+	ctx->Exit();
+
+	return engine;
 }
 
 Persistent<Script>* JsEngine::CompileScript(const uint16_t* str,
-                                            const uint16_t* resourceName,
-                                            jsvalue* error) {
-  Locker locker(isolate_);
-  Isolate::Scope isolate_scope(isolate_);
-
-  HandleScope scope(isolate_);
-  TryCatch trycatch(isolate_);
-
-  ((Context*)global_context_)->Enter();
-
-  Handle<String> source = String::NewFromTwoByte(isolate_, str);
-  Handle<Script> script;
-
-  if (resourceName != NULL) {
-    Handle<String> name = String::NewFromTwoByte(isolate_, resourceName);
-    ScriptOrigin scOrg(name);
-    script = Script::Compile(isolate_->GetCurrentContext(), source, &scOrg)
-                 .FromMaybe(Handle<Script>());
-  } else {
-    script = Script::Compile(isolate_->GetCurrentContext(), source, nullptr)
-                 .FromMaybe(Handle<Script>());
-  }
-
-  if (script.IsEmpty()) {
-    ErrorFromV8(trycatch, error);
-  }
-
-  ((Context*)global_context_)->Exit();
-  Persistent<Script>* pScript = new Persistent<Script>();
-  pScript->Reset(isolate_, script);
-  return pScript;
+	const uint16_t* resourceName,
+	jsvalue* error) {
+	Locker locker(isolate_);
+	Isolate::Scope isolate_scope(isolate_);
+
+	HandleScope scope(isolate_);
+	TryCatch trycatch(isolate_);
+
+	Local<Context> ctx = Local<Context>::New(isolate_, *global_context_);
+	ctx->Enter();
+	//((Context*)global_context_)->Enter();
+
+	Handle<String> source = String::NewFromTwoByte(isolate_, str);
+	Handle<Script> script;
+
+	if (resourceName != NULL) {
+		Handle<String> name = String::NewFromTwoByte(isolate_, resourceName);
+		ScriptOrigin scOrg(name);
+		script = Script::Compile(isolate_->GetCurrentContext(), source, &scOrg)
+			.FromMaybe(Handle<Script>());
+	} else {
+		script = Script::Compile(isolate_->GetCurrentContext(), source, nullptr)
+			.FromMaybe(Handle<Script>());
+	}
+
+	if (script.IsEmpty()) {
+		ErrorFromV8(trycatch, error);
+	}
+
+	ctx->Exit();
+	//((Context*)global_context_)->Exit();
+	Persistent<Script>* pScript = new Persistent<Script>();
+	pScript->Reset(isolate_, script);
+	return pScript;
 }
 
 void JsEngine::TerminateExecution() {
-  HandleScope scope(isolate_);
-  isolate_->TerminateExecution();
+	HandleScope scope(isolate_);
+	isolate_->TerminateExecution();
 }
 
 void JsEngine::DumpHeapStats() {
-  // Locker locker(isolate_);
-  //   	Isolate::Scope isolate_scope(isolate_);
-
-  //// gc first.
-  // while(!V8::IdleNotification()) {};
-  //
-  // HeapStatistics stats;
-  // isolate_->GetHeapStatistics(&stats);
-  //
-  // std::wcout << "Heap size limit " << (stats.heap_size_limit() / Mega) <<
-  // std::endl; std::wcout << "Total heap size " << (stats.total_heap_size() /
-  // Mega) << std::endl; std::wcout << "Heap size executable " <<
-  // (stats.total_heap_size_executable() / Mega) << std::endl; std::wcout <<
-  // "Total physical size " << (stats.total_physical_size() / Mega) <<
-  // std::endl; std::wcout << "Used heap size " << (stats.used_heap_size() /
-  // Mega) << std::endl;
+	// Locker locker(isolate_);
+	//   	Isolate::Scope isolate_scope(isolate_);
+
+	//// gc first.
+	// while(!V8::IdleNotification()) {};
+	//
+	// HeapStatistics stats;
+	// isolate_->GetHeapStatistics(&stats);
+	//
+	// std::wcout << "Heap size limit " << (stats.heap_size_limit() / Mega) <<
+	// std::endl; std::wcout << "Total heap size " << (stats.total_heap_size() /
+	// Mega) << std::endl; std::wcout << "Heap size executable " <<
+	// (stats.total_heap_size_executable() / Mega) << std::endl; std::wcout <<
+	// "Total physical size " << (stats.total_physical_size() / Mega) <<
+	// std::endl; std::wcout << "Used heap size " << (stats.used_heap_size() /
+	// Mega) << std::endl;
 }
 
 void JsEngine::Dispose() {
-  if (isolate_ != NULL) {
-    isolate_->Enter();
-
-    managed_template_->Reset();
-    delete managed_template_;
-    managed_template_ = NULL;
-
-    valueof_function_template_->Reset();
-    delete valueof_function_template_;
-    valueof_function_template_ = NULL;
-
-    global_context_->Reset();
-    delete global_context_;
-    global_context_ = NULL;
-
-    isolate_->Exit();
-    isolate_->Dispose();
-    isolate_ = NULL;
-    keepalive_remove_ = NULL;
-    keepalive_get_property_value_ = NULL;
-    keepalive_set_property_value_ = NULL;
-    keepalive_valueof_ = NULL;
-    keepalive_invoke_ = NULL;
-    keepalive_delete_property_ = NULL;
-    keepalive_enumerate_properties_ = NULL;
-  }
+	if (isolate_ != NULL) {
+		isolate_->Enter();
+
+		managed_template_->Reset();
+		delete managed_template_;
+		managed_template_ = NULL;
+
+		valueof_function_template_->Reset();
+		delete valueof_function_template_;
+		valueof_function_template_ = NULL;
+
+		global_context_->Reset();
+		delete global_context_;
+		global_context_ = NULL;
+
+		isolate_->Exit();
+		isolate_->Dispose();
+		isolate_ = NULL;
+		keepalive_remove_ = NULL;
+		keepalive_get_property_value_ = NULL;
+		keepalive_set_property_value_ = NULL;
+		keepalive_valueof_ = NULL;
+		keepalive_invoke_ = NULL;
+		keepalive_delete_property_ = NULL;
+		keepalive_enumerate_properties_ = NULL;
+	}
 }
 
 void JsEngine::DisposeObject(Persistent<Object>* obj) {
-  Locker locker(isolate_);
-  Isolate::Scope isolate_scope(isolate_);
-  obj->Reset();
+	Locker locker(isolate_);
+	Isolate::Scope isolate_scope(isolate_);
+	obj->Reset();
 }
 // TODO: JS_VALUE
 void JsEngine::ErrorFromV8(TryCatch& trycatch, jsvalue* output) {
-  // TODO: review TryCatch again
+	// TODO: review TryCatch again
 
-  HandleScope scope(isolate_);
+	HandleScope scope(isolate_);
 
-  Local<Value> exception = trycatch.Exception();
+	Local<Value> exception = trycatch.Exception();
 
-  output->type = JSVALUE_TYPE_UNKNOWN_ERROR;
-  output->ptr = NULL;  //?
-  output->i32 = 0;
+	output->type = JSVALUE_TYPE_UNKNOWN_ERROR;
+	output->ptr = NULL;  //?
+	output->i32 = 0;
 
-  // If this is a managed exception we need to place its ID inside the jsvalue
-  // and set the type JSVALUE_TYPE_MANAGED_ERROR to make sure the CLR side will
-  // throw on it.
+	// If this is a managed exception we need to place its ID inside the jsvalue
+	// and set the type JSVALUE_TYPE_MANAGED_ERROR to make sure the CLR side will
+	// throw on it.
 
-  if (exception->IsObject()) {
-    Local<Object> obj = Local<Object>::Cast(exception);
-    if (obj->InternalFieldCount() == 1) {
-      Local<External> wrap = Local<External>::Cast(obj->GetInternalField(0));
-      ManagedRef* ref = (ManagedRef*)wrap->Value();
+	if (exception->IsObject()) {
+		Local<Object> obj = Local<Object>::Cast(exception);
+		if (obj->InternalFieldCount() == 1) {
+			Local<External> wrap = Local<External>::Cast(obj->GetInternalField(0));
+			ManagedRef* ref = (ManagedRef*)wrap->Value();
 
-      output->type = JSVALUE_TYPE_MANAGED_ERROR;
-      output->i32 = ref->Id();
+			output->type = JSVALUE_TYPE_MANAGED_ERROR;
+			output->i32 = ref->Id();
 
-      return;
-    }
-  }
+			return;
+		}
+	}
 
-  // TODO: review here
-  jserror* error = new jserror();  // ONHEAP
-  memset(error, 0, sizeof(jserror));
+	// TODO: review here
+	jserror* error = new jserror();  // ONHEAP
+	memset(error, 0, sizeof(jserror));
 
-  Local<Message> message = trycatch.Message();
+	Local<Message> message = trycatch.Message();
 
-  auto thisHandle = Handle<Object>();
-  if (!message.IsEmpty()) {
-    error->line =
-        message->GetLineNumber(isolate_->GetCurrentContext()).FromMaybe(0);
-    error->column = message->GetStartColumn();
+	auto thisHandle = Handle<Object>();
+	if (!message.IsEmpty()) {
+		error->line =
+			message->GetLineNumber(isolate_->GetCurrentContext()).FromMaybe(0);
+		error->column = message->GetStartColumn();
 
-    error->resource = new jsvalue();
-    error->message = new jsvalue();
+		error->resource = new jsvalue();
+		error->message = new jsvalue();
 
-    AnyFromV8(message->GetScriptResourceName(), thisHandle, error->resource);
-    AnyFromV8(message->Get(), thisHandle, error->message);
-  }
-  if (exception->IsObject()) {
-    Local<Object> obj2 = Local<Object>::Cast(exception);
-    error->type = new jsvalue();
-    AnyFromV8(obj2->GetConstructorName(), thisHandle, error->type);
-  }
+		AnyFromV8(message->GetScriptResourceName(), thisHandle, error->resource);
+		AnyFromV8(message->Get(), thisHandle, error->message);
+	}
+	if (exception->IsObject()) {
+		Local<Object> obj2 = Local<Object>::Cast(exception);
+		error->type = new jsvalue();
+		AnyFromV8(obj2->GetConstructorName(), thisHandle, error->type);
+	}
 
-  error->exception = new jsvalue();
-  AnyFromV8(exception, thisHandle, error->exception);
+	error->exception = new jsvalue();
+	AnyFromV8(exception, thisHandle, error->exception);
 
-  output->type = JSVALUE_TYPE_ERROR;
-  output->ptr = error;  // point to native js error
+	output->type = JSVALUE_TYPE_ERROR;
+	output->ptr = error;  // point to native js error
 }
 
 void JsEngine::StringFromV8(Handle<Value> value, jsvalue* output) {
-  // create string output from v8 value
-  // and send back to jsvalue
-
-  // TODO: review how to alloc string again
-
-  Local<String> s = value->ToString();
-  int string_len = s->Length();
-  output->i32 = string_len;  // i32 as strign len
-  uint16_t* str_buffer =
-      new uint16_t[string_len + 1];  // null terminated string on HEAP
-  if (str_buffer != NULL) {
-    s->Write(str_buffer);
-    output->type = JSVALUE_TYPE_STRING;
-    output->ptr = str_buffer;
-  }
+	// create string output from v8 value
+	// and send back to jsvalue
+
+	// TODO: review how to alloc string again
+
+	Isolate* isolate = Isolate::GetCurrent();
+	Local<String> s = value->ToString(isolate);
+	int string_len = s->Length();
+	output->i32 = string_len;  // i32 as strign len
+	uint16_t* str_buffer =
+		new uint16_t[string_len + 1];  // null terminated string on HEAP
+	if (str_buffer != NULL) {
+		s->Write(isolate, str_buffer);
+		output->type = JSVALUE_TYPE_STRING;
+		output->ptr = str_buffer;
+	}
 }
 
 void JsEngine::WrappedFromV8(Handle<Object> obj, jsvalue* output) {
-  output->type = JSVALUE_TYPE_WRAPPED;
-  output->i32 = 0;
-  // A Persistent<Object> is exactly the size of an IntPtr, right?
-  // If not we're in deep deep trouble (on IA32 and AMD64 should be).
-  // We should even cast it to void* because C++ doesn't allow to put
-  // it in a union: going scary and scarier here.
-  // v.value.ptr = new Persistent<Object>(Persistent<Object>::New(obj));
-  Persistent<Object>* persistent = new Persistent<Object>();
-  persistent->Reset(isolate_, Persistent<Object>(isolate_, obj));
-  output->ptr =
-      persistent;  // new Persistent<Object>(Persistent<Object>(isolate_, obj));
-
-  //-------------------------------------------------------------------------
-  /*v.type = JSVALUE_TYPE_DICT;
-  Local<Array> names = obj->GetOwnPropertyNames();
-  v.length = names->Length();
-  jsvalue* values = new jsvalue[v.length * 2];
-  if (values != NULL) {
-          for(int i = 0; i < v.length; i++) {
-                  int indx = (i * 2);
-                  Local<Value> key = names->Get(i);
-                  values[indx] = AnyFromV8(key);
-                  values[indx+1] = AnyFromV8(obj->Get(key));
-          }
-          v.value.arr = values;
-  }*/
+	output->type = JSVALUE_TYPE_WRAPPED;
+	output->i32 = 0;
+	// A Persistent<Object> is exactly the size of an IntPtr, right?
+	// If not we're in deep deep trouble (on IA32 and AMD64 should be).
+	// We should even cast it to void* because C++ doesn't allow to put
+	// it in a union: going scary and scarier here.
+	// v.value.ptr = new Persistent<Object>(Persistent<Object>::New(obj));
+	Persistent<Object>* persistent = new Persistent<Object>();
+	persistent->Reset(isolate_, Persistent<Object>(isolate_, obj));
+	output->ptr =
+		persistent;  // new Persistent<Object>(Persistent<Object>(isolate_, obj));
+
+	//-------------------------------------------------------------------------
+	/*v.type = JSVALUE_TYPE_DICT;
+	Local<Array> names = obj->GetOwnPropertyNames();
+	v.length = names->Length();
+	jsvalue* values = new jsvalue[v.length * 2];
+	if (values != NULL) {
+			for(int i = 0; i < v.length; i++) {
+					int indx = (i * 2);
+					Local<Value> key = names->Get(i);
+					values[indx] = AnyFromV8(key);
+					values[indx+1] = AnyFromV8(obj->Get(key));
+			}
+			v.value.arr = values;
+	}*/
 }
 
 void JsEngine::ManagedFromV8(Handle<Object> obj, jsvalue* output) {
-  Local<External> wrap = Local<External>::Cast(obj->GetInternalField(0));
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  output->type =
-      ref->IsJsTypeDef() ? JSVALUE_TYPE_JSTYPEDEF : JSVALUE_TYPE_MANAGED;
-  output->i32 = ref->Id();
-  output->ptr = nullptr;
+	Local<External> wrap = Local<External>::Cast(obj->GetInternalField(0));
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	output->type =
+		ref->IsJsTypeDef() ? JSVALUE_TYPE_JSTYPEDEF : JSVALUE_TYPE_MANAGED;
+	output->i32 = ref->Id();
+	output->ptr = nullptr;
 }
 
 void JsEngine::AnyFromV8(Handle<Value> value,
-                         Handle<Object> thisArg,
-                         jsvalue* output) {
-  // Initialize to a generic error.
-  output->type = JSVALUE_TYPE_UNKNOWN_ERROR;
-  output->i32 = 0;
-  output->ptr = nullptr;
-
-  if (value->IsNull() || value->IsUndefined()) {
-    output->type = JSVALUE_TYPE_NULL;
-  } else if (value->IsBoolean()) {
-    output->type = JSVALUE_TYPE_BOOLEAN;
-    output->i32 = value->BooleanValue() ? 1 : 0;
-  } else if (value->IsInt32()) {
-    output->type = JSVALUE_TYPE_INTEGER;
-    output->i32 = value->Int32Value();
-  } else if (value->IsUint32()) {
-    output->type = JSVALUE_TYPE_INDEX;
-    output->i64 = value->Uint32Value();
-  } else if (value->IsNumber()) {
-    output->type = JSVALUE_TYPE_NUMBER;
-    output->num = value->NumberValue();
-  } else if (value->IsString()) {
-    StringFromV8(value, output);
-  } else if (value->IsDate()) {
-    output->type = JSVALUE_TYPE_DATE;
-    // v.value.num = value->NumberValue();
-    output->i64 = value->IntegerValue();
-  } else if (value->IsArray()) {
-    Handle<Array> object = Handle<Array>::Cast(value->ToObject());
-    int arrLen = object->Length();
-    // ON HEAP
-    jsvalue* arr = (jsvalue*)calloc(arrLen, sizeof(jsvalue));
-    if (arr != NULL) {
-      output->i32 = arrLen;  // i32 as array len
-      auto handle_object = Handle<Object>();
-      for (int i = 0; i < arrLen; i++) {
-        AnyFromV8(object->Get(i), handle_object, (arr + i));
-      }
-      output->type = JSVALUE_TYPE_ARRAY;
-      output->ptr = arr;
-    }
-  } else if (value->IsFunction()) {
-    Handle<Function> function = Handle<Function>::Cast(value);
-    // ON HEAP
-    jsvalue* arr = (jsvalue*)calloc(2, sizeof(jsvalue));
-    if (arr != NULL) {
-      arr->ptr = new Persistent<Object>(
-          isolate_, Persistent<Function>(isolate_, function));
-      arr->i32 = 0;
-      arr->type = JSVALUE_TYPE_WRAPPED;
-
-      jsvalue* arr_1 = arr + 1;
-
-      if (!thisArg.IsEmpty()) {
-        Persistent<Object>* persistent = new Persistent<Object>();
-        persistent->Reset(isolate_, Persistent<Object>(isolate_, thisArg));
-
-        arr_1->type = JSVALUE_TYPE_WRAPPED;
-        arr_1->ptr =
-            persistent;  // new Persistent<Object>(Persistent<Object>(isolate_,
-                         // thisArg));
-        arr_1->i32 = 0;
-
-      } else {
-        arr_1->type = JSVALUE_TYPE_NULL;
-        arr_1->ptr = NULL;
-        arr_1->i32 = 0;
-      }
-      output->type = JSVALUE_TYPE_FUNCTION;
-      output->ptr = arr;
-    }
-  } else if (value->IsObject()) {
-    Handle<Object> obj = Handle<Object>::Cast(value);
-    if (obj->InternalFieldCount() == 1)
-      ManagedFromV8(obj, output);
-    else
-      WrappedFromV8(obj, output);
-  }
+	Handle<Object> thisArg,
+	jsvalue* output) {
+	// Initialize to a generic error.
+	output->type = JSVALUE_TYPE_UNKNOWN_ERROR;
+	output->i32 = 0;
+	output->ptr = nullptr;
+
+	Isolate* isolate = Isolate::GetCurrent();
+	Local<Context> context = isolate->GetCurrentContext();
+	if (value->IsNull() || value->IsUndefined()) {
+		output->type = JSVALUE_TYPE_NULL;
+	} else if (value->IsBoolean()) {
+		output->type = JSVALUE_TYPE_BOOLEAN;
+		output->i32 = value->BooleanValue(isolate) ? 1 : 0;
+	} else if (value->IsInt32()) {
+		output->type = JSVALUE_TYPE_INTEGER;
+		output->i32 = value->Int32Value(context).ToChecked();
+	} else if (value->IsUint32()) {
+		output->type = JSVALUE_TYPE_INDEX;
+		output->i64 = value->Uint32Value(context).ToChecked();
+	} else if (value->IsNumber()) {
+		output->type = JSVALUE_TYPE_NUMBER;
+		output->num = value->NumberValue(context).ToChecked();
+	} else if (value->IsString()) {
+		StringFromV8(value, output);
+	} else if (value->IsDate()) {
+		output->type = JSVALUE_TYPE_DATE;
+		// v.value.num = value->NumberValue();
+		output->i64 = value->IntegerValue(context).ToChecked();
+	} else if (value->IsArray()) {
+		Handle<Array> object = Handle<Array>::Cast(value->ToObject(isolate));
+		int arrLen = object->Length();
+		// ON HEAP
+		jsvalue* arr = (jsvalue*)calloc(arrLen, sizeof(jsvalue));
+		if (arr != NULL) {
+			output->i32 = arrLen;  // i32 as array len
+			auto handle_object = Handle<Object>();
+			for (int i = 0; i < arrLen; i++) {
+				AnyFromV8(object->Get(i), handle_object, (arr + i));
+			}
+			output->type = JSVALUE_TYPE_ARRAY;
+			output->ptr = arr;
+		}
+	} else if (value->IsFunction()) {
+		Handle<Function> function = Handle<Function>::Cast(value);
+		// ON HEAP
+		jsvalue* arr = (jsvalue*)calloc(2, sizeof(jsvalue));
+		if (arr != NULL) {
+			arr->ptr = new Persistent<Object>(
+				isolate_, Persistent<Function>(isolate_, function));
+			arr->i32 = 0;
+			arr->type = JSVALUE_TYPE_WRAPPED;
+
+			jsvalue* arr_1 = arr + 1;
+
+			if (!thisArg.IsEmpty()) {
+				Persistent<Object>* persistent = new Persistent<Object>();
+				persistent->Reset(isolate_, Persistent<Object>(isolate_, thisArg));
+
+				arr_1->type = JSVALUE_TYPE_WRAPPED;
+				arr_1->ptr =
+					persistent;  // new Persistent<Object>(Persistent<Object>(isolate_,
+								 // thisArg));
+				arr_1->i32 = 0;
+
+			} else {
+				arr_1->type = JSVALUE_TYPE_NULL;
+				arr_1->ptr = NULL;
+				arr_1->i32 = 0;
+			}
+			output->type = JSVALUE_TYPE_FUNCTION;
+			output->ptr = arr;
+		}
+	} else if (value->IsObject()) {
+		Handle<Object> obj = Handle<Object>::Cast(value);
+		if (obj->InternalFieldCount() == 1)
+			ManagedFromV8(obj, output);
+		else
+			WrappedFromV8(obj, output);
+	}
 }
 
 void JsEngine::ArrayFromArguments(const FunctionCallbackInfo<Value>& args,
-                                  jsvalue* output) {
-  int arg_len = args.Length();
-
-  jsvalue_alloc_array(arg_len, output);
-  Local<Object> thisArg = args.Holder();
-  jsvalue* arr = (jsvalue*)output->ptr;
-  for (int i = 0; i < arg_len; i++) {
-    AnyFromV8(args[i], thisArg, arr + i);
-  }
+	jsvalue* output) {
+	int arg_len = args.Length();
+
+	jsvalue_alloc_array(arg_len, output);
+	Local<Object> thisArg = args.Holder();
+	jsvalue* arr = (jsvalue*)output->ptr;
+	for (int i = 0; i < arg_len; i++) {
+		AnyFromV8(args[i], thisArg, arr + i);
+	}
 }
 
 #ifdef NODE7
 static void managed_destroy(
-    const v8::WeakCallbackInfo<v8::Local<v8::Object>>& data) {
+	const v8::WeakCallbackInfo<v8::Local<v8::Object>>& data) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_destroy" << std::endl;
+	std::cout << "managed_destroy" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  HandleScope scope(isolate);
-
-  void* internalField = data.GetInternalField(0);
-  ManagedRef* ref = (ManagedRef*)internalField;
-  delete ref;
-
-  // Local<Object> selfHandle1 = Local<Object>::New(isolate,
-  // data.GetInternalField(0));//0.12.x Persistent<Object> self;// =
-  // Persistent<Object>(isolate, data.GetValue());//0.12.x self.Reset(isolate,
-  // data); Local<Object> selfHandle = Local<Object>::New(isolate,
-  // self);//0.12.x Local<External> wrap =
-  // Local<External>::Cast(selfHandle->GetInternalField(0));//0.12.x ManagedRef*
-  // ref = (ManagedRef*)wrap->Value(); delete ref;
+	Isolate* isolate = Isolate::GetCurrent();
+	HandleScope scope(isolate);
+
+	void* internalField = data.GetInternalField(0);
+	ManagedRef* ref = (ManagedRef*)internalField;
+	delete ref;
+
+	// Local<Object> selfHandle1 = Local<Object>::New(isolate,
+	// data.GetInternalField(0));//0.12.x Persistent<Object> self;// =
+	// Persistent<Object>(isolate, data.GetValue());//0.12.x self.Reset(isolate,
+	// data); Local<Object> selfHandle = Local<Object>::New(isolate,
+	// self);//0.12.x Local<External> wrap =
+	// Local<External>::Cast(selfHandle->GetInternalField(0));//0.12.x ManagedRef*
+	// ref = (ManagedRef*)wrap->Value(); delete ref;
 }
 #else
 
 static void managed_destroy(
-    const v8::WeakCallbackData<v8::Object, v8::Local<v8::Object>>& data) {
+	const v8::WeakCallbackData<v8::Object, v8::Local<v8::Object>>& data) {
 #ifdef DEBUG_TRACE_API
-  std::cout << "managed_destroy" << std::endl;
+	std::cout << "managed_destroy" << std::endl;
 #endif
-  Isolate* isolate = Isolate::GetCurrent();
-  HandleScope scope(isolate);
-
-  Persistent<Object>
-      self;  // = Persistent<Object>(isolate, data.GetValue());//0.12.x
-  self.Reset(isolate, data.GetValue());
-  Local<Object> selfHandle = Local<Object>::New(isolate, self);  // 0.12.x
-  Local<External> wrap =
-      Local<External>::Cast(selfHandle->GetInternalField(0));  // 0.12.x
-  ManagedRef* ref = (ManagedRef*)wrap->Value();
-  delete ref;
-  // puts(NULL);//TODO
-  // object.Reset();
-  // puts(*data.GetParameter());
-  // Isolate* isolate = Isolate::GetCurrent();
-  //   HandleScope scope(isolate);
-  //
-  //   Persistent<Object> self = Persistent<Object>::Cast(object);
-
-  //   Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
-  // ManagedRef* ref = (ManagedRef*)wrap->Value();
-  //   delete ref;
-  // object.Reset();
+	Isolate* isolate = Isolate::GetCurrent();
+	HandleScope scope(isolate);
+
+	Persistent<Object>
+		self;  // = Persistent<Object>(isolate, data.GetValue());//0.12.x
+	self.Reset(isolate, data.GetValue());
+	Local<Object> selfHandle = Local<Object>::New(isolate, self);  // 0.12.x
+	Local<External> wrap =
+		Local<External>::Cast(selfHandle->GetInternalField(0));  // 0.12.x
+	ManagedRef* ref = (ManagedRef*)wrap->Value();
+	delete ref;
+	// puts(NULL);//TODO
+	// object.Reset();
+	// puts(*data.GetParameter());
+	// Isolate* isolate = Isolate::GetCurrent();
+	//   HandleScope scope(isolate);
+	//
+	//   Persistent<Object> self = Persistent<Object>::Cast(object);
+
+	//   Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
+	// ManagedRef* ref = (ManagedRef*)wrap->Value();
+	//   delete ref;
+	// object.Reset();
 }
 #endif
 
 Handle<Value> JsEngine::AnyToV8(jsvalue* v, int32_t contextId) {
-  // convert to v8 value from a given jsvalue
-  switch (v->type) {
-    case JSVALUE_TYPE_EMPTY:
-      return Handle<Value>();
-    case JSVALUE_TYPE_NULL:
-      return Null(isolate_);
-    case JSVALUE_TYPE_BOOLEAN:
-      return Boolean::New(isolate_, v->i32 != 0);  // TODO
-    case JSVALUE_TYPE_INTEGER:
-      return Int32::New(isolate_, v->i32);
-    case JSVALUE_TYPE_NUMBER:
-      return Number::New(isolate_, v->num);
-    case JSVALUE_TYPE_STRING:
-      return String::NewFromTwoByte(isolate_,
-                                    (uint16_t*)v->ptr);  //::New(v.value.str);
-    case JSVALUE_TYPE_DATE:
-      return Date::New(isolate_, v->num);
-    case JSVALUE_TYPE_JSTYPEDEF: {
-      ManagedRef* ext = (ManagedRef*)v->ptr;
-      Local<Object> obj = Local<Object>::New(isolate_, ext->v8InstanceHandler);
-
-      return obj;
-    }
-    case JSVALUE_TYPE_ARRAY: {
-      // Arrays are converted to JS native arrays.
-      int arrLen = v->i32;
-      jsvalue* arr = (jsvalue*)v->ptr;
-      Local<Array> a = Array::New(isolate_, arrLen);  // i32 as length
-      for (int i = 0; i < arrLen; i++) {
-        a->Set(i, AnyToV8((arr + i), contextId));
-      }
-      return a;
-    }
-    case JSVALUE_TYPE_MANAGED:
-    case JSVALUE_TYPE_MANAGED_ERROR: {
-      // This is an ID to a managed object that lives inside the JsContext
-      // keep-alive cache. We just wrap it and the pointer to the engine inside
-      // an External. A managed error is still a CLR object so it is wrapped
-      // exactly as a normal managed object.
-
-      // ON_NATIVE_HEAP
-      ManagedRef* ref = new ManagedRef(
-          this, contextId, v->i32, false);  // i32 as managed refence slot id
-      Local<Object> object = ((FunctionTemplate*)managed_template_)
-                                 ->InstanceTemplate()
-                                 ->NewInstance();
-      if (object.IsEmpty()) {
-        return Null(isolate_);
-      }
-      object->SetInternalField(0, External::New(isolate_, ref));
-      Persistent<Object> persistent(isolate_, object);
+	// convert to v8 value from a given jsvalue
+	switch (v->type) {
+	case JSVALUE_TYPE_EMPTY:
+		return Handle<Value>();
+	case JSVALUE_TYPE_NULL:
+		return Null(isolate_);
+	case JSVALUE_TYPE_BOOLEAN:
+		return Boolean::New(isolate_, v->i32 != 0);  // TODO
+	case JSVALUE_TYPE_INTEGER:
+		return Int32::New(isolate_, v->i32);
+	case JSVALUE_TYPE_NUMBER:
+		return Number::New(isolate_, v->num);
+	case JSVALUE_TYPE_STRING:
+		return String::NewFromTwoByte(isolate_,
+			(uint16_t*)v->ptr);  //::New(v.value.str);
+	case JSVALUE_TYPE_DATE:
+		return Date::New(isolate_->GetCurrentContext(), v->num).ToLocalChecked();
+	case JSVALUE_TYPE_JSTYPEDEF: {
+		ManagedRef* ext = (ManagedRef*)v->ptr;
+		Local<Object> obj = Local<Object>::New(isolate_, ext->v8InstanceHandler);
+
+		return obj;
+	}
+	case JSVALUE_TYPE_ARRAY: {
+		// Arrays are converted to JS native arrays.
+		int arrLen = v->i32;
+		jsvalue* arr = (jsvalue*)v->ptr;
+		Local<Array> a = Array::New(isolate_, arrLen);  // i32 as length
+		for (int i = 0; i < arrLen; i++) {
+			a->Set(i, AnyToV8((arr + i), contextId));
+		}
+		return a;
+	}
+	case JSVALUE_TYPE_MANAGED:
+	case JSVALUE_TYPE_MANAGED_ERROR: {
+		// This is an ID to a managed object that lives inside the JsContext
+		// keep-alive cache. We just wrap it and the pointer to the engine inside
+		// an External. A managed error is still a CLR object so it is wrapped
+		// exactly as a normal managed object.
+
+		// ON_NATIVE_HEAP
+		ManagedRef* ref = new ManagedRef(
+			this, contextId, v->i32, false);  // i32 as managed refence slot id
+		Local<Object> object = ((FunctionTemplate*)managed_template_)
+			->InstanceTemplate()
+			->NewInstance(isolate_->GetCurrentContext()).ToLocalChecked();
+		if (object.IsEmpty()) {
+			return Null(isolate_);
+		}
+		object->SetInternalField(0, External::New(isolate_, ref));
+		Persistent<Object> persistent(isolate_, object);
 #ifdef NODE7
-      // persistent.SetWeak(&object, managed_destroy);
-      persistent.SetWeak(
-          &object, managed_destroy, v8::WeakCallbackType::kFinalizer);
+		// persistent.SetWeak(&object, managed_destroy);
+		persistent.SetWeak(
+			&object, managed_destroy, v8::WeakCallbackType::kFinalizer);
 #else
-      persistent.SetWeak(&object, managed_destroy);
+		persistent.SetWeak(&object, managed_destroy);
 #endif
-      Local<Object> handle = Local<Object>::New(isolate_, persistent);
-      return handle;
-    }
-  }
-  return Null(isolate_);
+		Local<Object> handle = Local<Object>::New(isolate_, persistent);
+		return handle;
+	}
+	}
+	return Null(isolate_);
 }
 int32_t JsEngine::ArrayToV8Args(jsvalue* value,
-                                int32_t contextId,
-                                Handle<Value> preallocatedArgs[]) {
-  if (value->type != JSVALUE_TYPE_ARRAY) return -1;
-
-  int arrLen = value->i32;  // arr len
-  jsvalue* arr = (jsvalue*)value->ptr;
-  for (int i = 0; i < arrLen; i++) {
-    preallocatedArgs[i] = AnyToV8((arr + i), contextId);
-  }
-  return arrLen;
+	int32_t contextId,
+	Handle<Value> preallocatedArgs[]) {
+	if (value->type != JSVALUE_TYPE_ARRAY) return -1;
+
+	int arrLen = value->i32;  // arr len
+	jsvalue* arr = (jsvalue*)value->ptr;
+	for (int i = 0; i < arrLen; i++) {
+		preallocatedArgs[i] = AnyToV8((arr + i), contextId);
+	}
+	return arrLen;
 }
diff --git a/libespresso/libespresso.sln b/libespresso/libespresso.sln
new file mode 100644
index 00000000..1815b739
--- /dev/null
+++ b/libespresso/libespresso.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2003
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libespr", "libespresso.vcxproj", "{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x64.ActiveCfg = Debug|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x64.Build.0 = Debug|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x86.ActiveCfg = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Debug|x86.Build.0 = Debug|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x64.ActiveCfg = Release|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x64.Build.0 = Release|x64
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x86.ActiveCfg = Release|Win32
+		{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {876B8F4E-005B-43B3-8895-F7F188F887B0}
+	EndGlobalSection
+EndGlobal
diff --git a/libespresso/libespresso.vcxproj b/libespresso/libespresso.vcxproj
index 00a5e1a6..fd7796b3 100644
--- a/libespresso/libespresso.vcxproj
+++ b/libespresso/libespresso.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\v8.symbols-v141-x64.7.4.288.11\build\native\v8.symbols-v141-x64.props" Condition="Exists('..\packages\v8.symbols-v141-x64.7.4.288.11\build\native\v8.symbols-v141-x64.props')" />
+  <Import Project="packages\v8-v141-x64.7.4.288.11\build\native\v8-v141-x64.props" Condition="Exists('packages\v8-v141-x64.7.4.288.11\build\native\v8-v141-x64.props')" />
+  <Import Project="packages\v8.redist-v141-x64.7.4.288.11\build\native\v8.redist-v141-x64.props" Condition="Exists('packages\v8.redist-v141-x64.7.4.288.11\build\native\v8.redist-v141-x64.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,41 +22,44 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{880EF82B-4FAD-42B1-98A6-09B5835F5FE6}</ProjectGuid>
     <RootNamespace>libespr</RootNamespace>
     <ProjectName>libespr</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</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>
@@ -68,171 +74,116 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)build\Net20\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>
-        ..\..\node-v11.12.0\deps\v8\include;
-        ..\..\node-v11.12.0\deps\v8\src\base;
-        ..\..\node-v11.12.0\deps\v8;
-        %(AdditionalIncludeDirectories)
-      </AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;BRIDGEWINDOWS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>
-        ..\..\node-v11.12.0\Debug\lib\v8_base_0.lib;
-		..\..\node-v11.12.0\Debug\lib\v8_base_1.lib;
-		..\..\node-v11.12.0\Debug\lib\v8_base_2.lib;
-		..\..\node-v11.12.0\Debug\lib\v8_base_3.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_init.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_initializers.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_libbase.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_libplatform.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_libsampler.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_nosnapshot.lib;
-        ..\..\node-v11.12.0\Debug\lib\icudata.lib;
-        ..\..\node-v11.12.0\Debug\lib\icuucx.lib;
-        ..\..\node-v11.12.0\Debug\lib\icui18n.lib;
-        ..\..\node-v11.12.0\Debug\lib\icutools.lib;
-        winmm.lib;ws2_32.lib;Advapi32.lib;dbghelp.lib;shlwapi.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>
-        ..\..\node-v11.12.0\deps\v8\include;
-        ..\..\node-v11.12.0\deps\v8\src\base;
-        ..\..\node-v11.12.0\deps\v8
-      </AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;BRIDGEWINDOWS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>
-        ..\..\node-v11.12.0\Release\lib\v8_base_0.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_1.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_2.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_3.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_init.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_initializers.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_libbase.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_libplatform.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_libsampler.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_nosnapshot.lib;
-		..\..\node-v11.12.0\Release\lib\icudata.lib;
-        ..\..\node-v11.12.0\Release\lib\icuucx.lib;
-        ..\..\node-v11.12.0\Release\lib\icui18n.lib;
-        winmm.lib;ws2_32.lib;dbghelp.lib;shlwapi.lib;
-        %(AdditionalDependencies)
-      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>
-        ..\..\node-v11.12.0\deps\v8\include;
-        ..\..\node-v11.12.0\deps\v8\src\base;
-        ..\..\node-v11.12.0\deps\v8;
-        %(AdditionalIncludeDirectories)
-      </AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;BRIDGEWINDOWS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>
-        ..\..\node-v11.12.0\Release\lib\v8_base_0.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_1.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_2.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_3.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_init.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_initializers.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_libbase.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_libplatform.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_libsampler.lib;
-        ..\..\node-v11.12.0\Debug\lib\v8_nosnapshot.lib;
-        ..\..\node-v11.12.0\Debug\lib\icudata.lib;
-        ..\..\node-v11.12.0\Debug\lib\icuucx.lib;
-        ..\..\node-v11.12.0\Debug\lib\icui18n.lib; 
-        ..\..\node-v11.12.0\Debug\lib\icutools.lib;
-        winmm.lib;ws2_32.lib;Advapi32.lib;dbghelp.lib;shlwapi.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>
-        ..\..\node-v11.12.0\deps\v8\include;
-        ..\..\node-v11.12.0\deps\v8\src\base;
-        ..\..\node-v11.12.0\deps\v8
-      </AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;BRIDGEWINDOWS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>
-        ..\..\node-v11.12.0\Release\lib\v8_base_0.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_1.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_2.lib;
-		..\..\node-v11.12.0\Release\lib\v8_base_3.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_init.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_initializers.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_libbase.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_libplatform.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_libsampler.lib;
-        ..\..\node-v11.12.0\Release\lib\v8_nosnapshot.lib;
-		..\..\node-v11.12.0\Release\lib\icudata.lib;
-        ..\..\node-v11.12.0\Release\lib\icuucx.lib;
-        ..\..\node-v11.12.0\Release\lib\icui18n.lib;
-        winmm.lib;ws2_32.lib;dbghelp.lib;shlwapi.lib;
-        %(AdditionalDependencies)
-      </AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="bridge2.h" />
+    <ClInclude Include="espresso.h" />
+    <ClInclude Include="jsscript.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="bridge.cpp" />
     <ClCompile Include="bridge2_impl.cpp" />
-    <ClCompile Include="bridge2.h" />
     <ClCompile Include="jscontext.cpp" />
     <ClCompile Include="jsengine.cpp" />
     <ClCompile Include="jsscript.cpp" />
     <ClCompile Include="managedref.cpp" />
     <ClCompile Include="mini_BinaryReaderWriter.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="espresso.h" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\v8.redist-v141-x64.7.4.288.11\build\native\v8.redist-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\v8.redist-v141-x64.7.4.288.11\build\native\v8.redist-v141-x64.props'))" />
+    <Error Condition="!Exists('packages\v8-v141-x64.7.4.288.11\build\native\v8-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\v8-v141-x64.7.4.288.11\build\native\v8-v141-x64.props'))" />
+    <Error Condition="!Exists('..\packages\v8.symbols-v141-x64.7.4.288.11\build\native\v8.symbols-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.symbols-v141-x64.7.4.288.11\build\native\v8.symbols-v141-x64.props'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/libespresso/managedref.cpp b/libespresso/managedref.cpp
index e1a0ee68..bf56f6e7 100644
--- a/libespresso/managedref.cpp
+++ b/libespresso/managedref.cpp
@@ -37,12 +37,12 @@ Handle<Value> ManagedRef::GetPropertyValue(Local<String> name)
 {
 	Handle<Value> res;
 
-	String::Value s(name);
+	Isolate* isolate = Isolate::GetCurrent();
+	String::Value s(isolate, name);
 
 #ifdef DEBUG_TRACE_API
 	std::cout << "GetPropertyValue" << std::endl;
 #endif
-	Isolate* isolate = Isolate::GetCurrent();
 	jsvalue r;
 	memset(&r, 0, sizeof(jsvalue));
 	engine_->CallGetPropertyValue(contextId_, id_, *s, &r);
@@ -64,12 +64,12 @@ Handle<Boolean> ManagedRef::DeleteProperty(Local<String> name)
 {
 	Handle<Value> res;
 
-	String::Value s(name);
+	Isolate* isolate = Isolate::GetCurrent();
+	String::Value s(isolate, name);
 
 #ifdef DEBUG_TRACE_API
 	std::cout << "DeleteProperty" << std::endl;
 #endif
-	Isolate* isolate = Isolate::GetCurrent();
 	jsvalue r;
 	memset(&r, 0, sizeof(jsvalue));
 	engine_->CallDeleteProperty(contextId_, id_, *s, &r);
@@ -83,19 +83,19 @@ Handle<Boolean> ManagedRef::DeleteProperty(Local<String> name)
 #endif
 	// We don't need the jsvalue anymore and the CLR side never reuse them.
 	jsvalue_dispose(&r);
-	return res->ToBoolean();
+	return res->ToBoolean(isolate);
 }
 
 Handle<Value> ManagedRef::SetPropertyValue(Local<String> name, Local<Value> value)
 {
 	Handle<Value> res;
 
-	String::Value s(name);
+	Isolate* isolate = Isolate::GetCurrent();
+	String::Value s(isolate, name);
 
 #ifdef DEBUG_TRACE_API
 	std::cout << "SetPropertyValue" << std::endl;
 #endif
-	Isolate* isolate = Isolate::GetCurrent();
 	jsvalue r, v;
 	memset(&r, 0, sizeof(jsvalue));
 	memset(&v, 0, sizeof(jsvalue));
diff --git a/libespresso/stdafx.cpp b/libespresso/stdafx.cpp
new file mode 100644
index 00000000..08343afd
Binary files /dev/null and b/libespresso/stdafx.cpp differ
diff --git a/libespresso/stdafx.h b/libespresso/stdafx.h
new file mode 100644
index 00000000..7e9fc495
Binary files /dev/null and b/libespresso/stdafx.h differ
diff --git a/libespresso/targetver.h b/libespresso/targetver.h
new file mode 100644
index 00000000..7f8bdf09
Binary files /dev/null and b/libespresso/targetver.h differ
diff --git a/src/0_Start/JsBridge.cs b/src/0_Start/JsBridge.cs
index 033f8b90..22fa9d1f 100644
--- a/src/0_Start/JsBridge.cs
+++ b/src/0_Start/JsBridge.cs
@@ -14,9 +14,9 @@ static JsBridge()
         {
 
         }
-        public static void V8Init()
+        public static void V8Init(string location)
         {
-            NativeV8JsInterOp.V8Init();
+            NativeV8JsInterOp.V8Init(location);
         }
 
         public static int LibVersion => getVersion(); 
diff --git a/src/0_Start/ScriptInterfaces.cs b/src/0_Start/ScriptInterfaces.cs
index 8e57c90c..7f560751 100644
--- a/src/0_Start/ScriptInterfaces.cs
+++ b/src/0_Start/ScriptInterfaces.cs
@@ -4,179 +4,157 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Espresso
-{
-
-    public abstract class JsTypeMemberDefinition
-    {
-        readonly string _mbname;
-        readonly JsMemberKind _memberKind;
-        JsTypeDefinition _owner;
-        int _memberId;
-        internal INativeRef _nativeProxy;
-        public JsTypeMemberDefinition(string mbname, JsMemberKind memberKind)
-        {
-            _mbname = mbname;
-            _memberKind = memberKind;
-        }
-        public bool IsRegisterd => _nativeProxy != null;
-        public string MemberName => _mbname;
-        public JsMemberKind MemberKind => _memberKind;
-        public void SetOwner(JsTypeDefinition owner) => _owner = owner;
-
-        protected static void WriteUtf16String(string str, BinaryWriter writer)
-        {
-            char[] charBuff = str.ToCharArray();
-            writer.Write((short)charBuff.Length);
-            writer.Write(charBuff);
-        }
-        public int MemberId => _memberId;
-        public void SetMemberId(int memberId) => _memberId = memberId;
-
-
-    }
-    public class JsTypeDefinition : JsTypeMemberDefinition
-    {
-        //store definition for js
-        List<JsFieldDefinition> _fields = new List<JsFieldDefinition>();
-        List<JsMethodDefinition> _methods = new List<JsMethodDefinition>();
-        List<JsPropertyDefinition> _props = new List<JsPropertyDefinition>();
-
-        public JsTypeDefinition(string typename)
-            : base(typename, JsMemberKind.Type)
-        {
-        }
-        public void AddMember(JsMethodDefinition methodDef)
-        {
-            methodDef.SetOwner(this);
-            _methods.Add(methodDef);
-        }
-        public void AddMember(JsPropertyDefinition propDef)
-        {
-            propDef.SetOwner(this);
-            _props.Add(propDef);
-
-        }
-        /// <summary>
-        /// serialization this typedefinition to binary format and 
-        /// send to native side
-        /// </summary>
-        /// <param name="writer"></param>
-        internal void WriteDefinitionToStream(BinaryWriter writer)
-        {
-            //----------------------
-            //this is our custom protocol/convention with the MiniJsBridge            
-            //we may change this in the future
-            //eg. use json serialization/deserialization 
-            //----------------------
-
-            //1. kind/flags
-            writer.Write((short)this.MemberId);
-            //2. member id
-            writer.Write((short)0);
-            //3. typename                         
-            WriteUtf16String(this.MemberName, writer);
-
-            //4. num of field
-            int j = _fields.Count;
-            writer.Write((short)j);
-            for (int i = 0; i < j; ++i)
-            {
-                JsFieldDefinition fielddef = _fields[i];
-                //field flags
-                writer.Write((short)0);
-
-                //*** field id -- unique field id within one type
-                writer.Write((short)fielddef.MemberId);
-
-                //field name
-                WriteUtf16String(fielddef.MemberName, writer);
-            }
-            //------------------
-            j = _methods.Count;
-            writer.Write((short)j);
-            for (int i = 0; i < j; ++i)
-            {
-                JsMethodDefinition methoddef = _methods[i];
-                //method flags
-                writer.Write((short)0);
-                //id
-                writer.Write((short)methoddef.MemberId);
-                //method name
-                WriteUtf16String(methoddef.MemberName, writer);
-            }
-
-            //property
-            j = _props.Count;
-            writer.Write((short)j);
-            for (int i = 0; i < j; ++i)
-            {
-                JsPropertyDefinition property = _props[i];
-                //flags
-                writer.Write((short)0);
-                //id
-                writer.Write((short)property.MemberId);
-                //name
-                WriteUtf16String(property.MemberName, writer);
-            }
-
-        }
-
-        internal List<JsFieldDefinition> GetFields() => _fields;
-
-        internal List<JsMethodDefinition> GetMethods() => _methods;
-
-        internal List<JsPropertyDefinition> GetProperties() => _props;
-
-    }
-
-    public enum JsMemberKind
-    {
-        Field,
-        Method,
-        Event,
-        Property,
-        Indexer,
-        PropertyGet,
-        PropertySet,
-        IndexerGet,
-        IndexerSet,
-        Type
-    }
-
-    public class JsFieldDefinition : JsTypeMemberDefinition
-    {
-        public JsFieldDefinition(string fieldname)
-            : base(fieldname, JsMemberKind.Field)
-        {
-
-        }
-    }
-
-    public class JsPropertyDefinition : JsTypeMemberDefinition
-    {
-        public JsPropertyDefinition(string name)
-            : base(name, JsMemberKind.Property)
-        {
-            //create blank property and we can add getter/setter later
-
-        }
-        public JsPropertyDefinition(string name, JsMethodCallDel getter, JsMethodCallDel setter)
-            : base(name, JsMemberKind.Property)
-        {
-
-            if (getter != null)
-            {
-                this.GetterMethod = new JsPropertyGetDefinition(name, getter);
-            }
-            if (setter != null)
-            {
-                this.SetterMethod = new JsPropertySetDefinition(name, setter);
-            }
-        }
-        public JsPropertyDefinition(string name, System.Reflection.PropertyInfo propInfo)
-            : base(name, JsMemberKind.Property)
-        {
+namespace Espresso {
+	public abstract class JsTypeMemberDefinition {
+		readonly string _mbname;
+		readonly JsMemberKind _memberKind;
+		JsTypeDefinition _owner;
+		int _memberId;
+		internal INativeRef _nativeProxy;
+		public JsTypeMemberDefinition(string mbname, JsMemberKind memberKind) {
+			_mbname = mbname;
+			_memberKind = memberKind;
+		}
+		public bool IsRegisterd => _nativeProxy != null;
+		public string MemberName => _mbname;
+		public JsMemberKind MemberKind => _memberKind;
+		public void SetOwner(JsTypeDefinition owner) => _owner = owner;
+
+		protected static void WriteUtf16String(string str, BinaryWriter writer) {
+			char[] charBuff = str.ToCharArray();
+			writer.Write((short)charBuff.Length);
+			writer.Write(charBuff);
+		}
+		public int MemberId => _memberId;
+		public void SetMemberId(int memberId) => _memberId = memberId;
+
+
+	}
+	public class JsTypeDefinition : JsTypeMemberDefinition {
+		//store definition for js
+		List<JsFieldDefinition> _fields = new List<JsFieldDefinition>();
+		List<JsMethodDefinition> _methods = new List<JsMethodDefinition>();
+		List<JsPropertyDefinition> _props = new List<JsPropertyDefinition>();
+
+		public JsTypeDefinition(string typename)
+			: base(typename, JsMemberKind.Type) {
+		}
+		public void AddMember(JsMethodDefinition methodDef) {
+			methodDef.SetOwner(this);
+			_methods.Add(methodDef);
+		}
+		public void AddMember(JsPropertyDefinition propDef) {
+			propDef.SetOwner(this);
+			_props.Add(propDef);
+
+		}
+		/// <summary>
+		/// serialization this typedefinition to binary format and 
+		/// send to native side
+		/// </summary>
+		/// <param name="writer"></param>
+		internal void WriteDefinitionToStream(BinaryWriter writer) {
+			//----------------------
+			//this is our custom protocol/convention with the MiniJsBridge            
+			//we may change this in the future
+			//eg. use json serialization/deserialization 
+			//----------------------
+
+			//1. kind/flags
+			writer.Write((short)this.MemberId);
+			//2. member id
+			writer.Write((short)0);
+			//3. typename                         
+			WriteUtf16String(this.MemberName, writer);
+
+			//4. num of field
+			int j = _fields.Count;
+			writer.Write((short)j);
+			for (int i = 0; i < j; ++i) {
+				JsFieldDefinition fielddef = _fields[i];
+				//field flags
+				writer.Write((short)0);
+
+				//*** field id -- unique field id within one type
+				writer.Write((short)fielddef.MemberId);
+
+				//field name
+				WriteUtf16String(fielddef.MemberName, writer);
+			}
+			//------------------
+			j = _methods.Count;
+			writer.Write((short)j);
+			for (int i = 0; i < j; ++i) {
+				JsMethodDefinition methoddef = _methods[i];
+				//method flags
+				writer.Write((short)0);
+				//id
+				writer.Write((short)methoddef.MemberId);
+				//method name
+				WriteUtf16String(methoddef.MemberName, writer);
+			}
+
+			//property
+			j = _props.Count;
+			writer.Write((short)j);
+			for (int i = 0; i < j; ++i) {
+				JsPropertyDefinition property = _props[i];
+				//flags
+				writer.Write((short)0);
+				//id
+				writer.Write((short)property.MemberId);
+				//name
+				WriteUtf16String(property.MemberName, writer);
+			}
+
+		}
+
+		internal List<JsFieldDefinition> GetFields() => _fields;
+
+		internal List<JsMethodDefinition> GetMethods() => _methods;
+
+		internal List<JsPropertyDefinition> GetProperties() => _props;
+
+	}
+
+	public enum JsMemberKind {
+		Field,
+		Method,
+		Event,
+		Property,
+		Indexer,
+		PropertyGet,
+		PropertySet,
+		IndexerGet,
+		IndexerSet,
+		Type
+	}
+
+	public class JsFieldDefinition : JsTypeMemberDefinition {
+		public JsFieldDefinition(string fieldname)
+			: base(fieldname, JsMemberKind.Field) {
+
+		}
+	}
+
+	public class JsPropertyDefinition : JsTypeMemberDefinition {
+		public JsPropertyDefinition(string name)
+			: base(name, JsMemberKind.Property) {
+			//create blank property and we can add getter/setter later
+
+		}
+		public JsPropertyDefinition(string name, JsMethodCallDel getter, JsMethodCallDel setter)
+			: base(name, JsMemberKind.Property) {
+
+			if (getter != null) {
+				this.GetterMethod = new JsPropertyGetDefinition(name, getter);
+			}
+			if (setter != null) {
+				this.SetterMethod = new JsPropertySetDefinition(name, setter);
+			}
+		}
+		public JsPropertyDefinition(string name, System.Reflection.PropertyInfo propInfo)
+			: base(name, JsMemberKind.Property) {
 
 #if NET20
 
@@ -191,134 +169,112 @@ public JsPropertyDefinition(string name, System.Reflection.PropertyInfo propInfo
                 this.SetterMethod = new JsPropertySetDefinition(name, setter);
             }
 #else
-            var getter = propInfo.GetMethod;
-            if (getter != null)
-            {
-                this.GetterMethod = new JsPropertyGetDefinition(name, getter);
-            }
-            var setter = propInfo.SetMethod;
-            if (setter != null)
-            {
-                this.SetterMethod = new JsPropertySetDefinition(name, setter);
-            }
+			var getter = propInfo.GetMethod;
+			if (getter != null) {
+				this.GetterMethod = new JsPropertyGetDefinition(name, getter);
+			}
+			var setter = propInfo.SetMethod;
+			if (setter != null) {
+				this.SetterMethod = new JsPropertySetDefinition(name, setter);
+			}
 #endif
 
-        }
-        public JsPropertyGetDefinition GetterMethod { get; set; }
-        public JsPropertySetDefinition SetterMethod { get; set; }
-        public bool IsIndexer { get; set; }
-    }
-
-    public class JsPropertyGetDefinition : JsMethodDefinition
-    {
-
-        public JsPropertyGetDefinition(string name, JsMethodCallDel getter)
-            : base(name, getter)
-        {
-        }
-        public JsPropertyGetDefinition(string name, System.Reflection.MethodInfo getterMethod)
-            : base(name, getterMethod)
-        {
-        }
-    }
-
-    public class JsPropertySetDefinition : JsMethodDefinition
-    {
-
-        public JsPropertySetDefinition(string name, JsMethodCallDel setter)
-            : base(name, setter)
-        {
-        }
-        public JsPropertySetDefinition(string name, System.Reflection.MethodInfo setterMethod)
-            : base(name, setterMethod)
-        {
-        }
-    }
-
-    public class JsMethodDefinition : JsTypeMemberDefinition
-    {
-
-        JsMethodCallDel _methodCallDel;
-        System.Reflection.MethodInfo _method;
-        System.Reflection.ParameterInfo[] _parameterInfoList;
-        System.Type _methodReturnType;
-        bool _isReturnTypeVoid;
-
-        public JsMethodDefinition(string methodName, JsMethodCallDel methodCallDel)
-            : base(methodName, JsMemberKind.Method)
-        {
-            _methodCallDel = methodCallDel;
-        }
-
-        public JsMethodDefinition(string methodName, System.Reflection.MethodInfo method)
-            : base(methodName, JsMemberKind.Method)
-        {
-            _method = method;
-            //analyze expected arg type
-            //and conversion plan
-            _parameterInfoList = method.GetParameters();
-            _methodReturnType = method.ReturnType;
-            _isReturnTypeVoid = _methodReturnType == typeof(void);
-        }
-
-        internal System.Reflection.ParameterInfo[] Parameters => _parameterInfoList;
-        internal System.Reflection.MethodInfo MethodInfo => _method;
-        internal JsMethodCallDel JsMetDelegate => _methodCallDel;
-
-        public void InvokeMethod(ManagedMethodArgs args)
-        {
-            if (_method != null)
-            {
-                //invoke method
-
-                object thisArg = args.GetThisArg();
-
-                //actual input arg count
-                int actualArgCount = args.ArgCount;
-                //prepare parameters
-                int expectedParameterCount = _parameterInfoList.Length;
-                object[] parameters = new object[expectedParameterCount];
-
-                //TODO: review here
-                //check exact number
-                int lim = Math.Min(actualArgCount, expectedParameterCount);
-                //fill from the begin 
-                for (int i = 0; i < lim; ++i)
-                {
-                    object arg = args.GetArgAsObject(i);
-                    //if type not match then covert it
-                    if (arg is JsFunction)
-                    {
-                        //convert to deledate
-                        //check if the target need delegate
-                        var func = (JsFunction)arg;
-                        //create delegate for a specific target type***
-                        parameters[i] = func.MakeDelegate(_parameterInfoList[i].ParameterType);
-                    }
-                    else
-                    {
-                        parameters[i] = arg;
-                    }
-                }
-
-                //send to .net 
-                object result = _method.Invoke(thisArg, parameters);
-
-                if (_isReturnTypeVoid)
-                {
-                    //set to undefine because of void
-                    args.SetResultUndefined();
-                }
-                else
-                {
-                    args.SetResultObj(result);
-                }
-            }
-            else
-            {
-                _methodCallDel(args);
-            }
-        }
+		}
+		public JsPropertyGetDefinition GetterMethod { get; set; }
+		public JsPropertySetDefinition SetterMethod { get; set; }
+		public bool IsIndexer { get; set; }
+	}
+
+	public class JsPropertyGetDefinition : JsMethodDefinition {
+
+		public JsPropertyGetDefinition(string name, JsMethodCallDel getter)
+			: base(name, getter) {
+		}
+		public JsPropertyGetDefinition(string name, System.Reflection.MethodInfo getterMethod)
+			: base(name, getterMethod) {
+		}
+	}
+
+	public class JsPropertySetDefinition : JsMethodDefinition {
+
+		public JsPropertySetDefinition(string name, JsMethodCallDel setter)
+			: base(name, setter) {
+		}
+		public JsPropertySetDefinition(string name, System.Reflection.MethodInfo setterMethod)
+			: base(name, setterMethod) {
+		}
+	}
+
+	public class JsMethodDefinition : JsTypeMemberDefinition {
+
+		JsMethodCallDel _methodCallDel;
+		System.Reflection.MethodInfo _method;
+		System.Reflection.ParameterInfo[] _parameterInfoList;
+		System.Type _methodReturnType;
+		bool _isReturnTypeVoid;
+
+		public JsMethodDefinition(string methodName, JsMethodCallDel methodCallDel)
+			: base(methodName, JsMemberKind.Method) {
+			_methodCallDel = methodCallDel;
+		}
+
+		public JsMethodDefinition(string methodName, System.Reflection.MethodInfo method)
+			: base(methodName, JsMemberKind.Method) {
+			_method = method;
+			//analyze expected arg type
+			//and conversion plan
+			_parameterInfoList = method.GetParameters();
+			_methodReturnType = method.ReturnType;
+			_isReturnTypeVoid = _methodReturnType == typeof(void);
+		}
+
+		internal System.Reflection.ParameterInfo[] Parameters => _parameterInfoList;
+		internal System.Reflection.MethodInfo MethodInfo => _method;
+		internal JsMethodCallDel JsMetDelegate => _methodCallDel;
+
+		public void InvokeMethod(ManagedMethodArgs args) {
+			if (_method != null) {
+				//invoke method
+
+				object thisArg = args.GetThisArg();
+
+				//actual input arg count
+				int actualArgCount = args.ArgCount;
+				//prepare parameters
+				int expectedParameterCount = _parameterInfoList.Length;
+				object[] parameters = new object[expectedParameterCount];
+
+				//TODO: review here
+				//check exact number
+				int lim = Math.Min(actualArgCount, expectedParameterCount);
+				//fill from the begin 
+				for (int i = 0; i < lim; ++i) {
+					object arg = args.GetArgAsObject(i);
+					//if type not match then covert it
+					if (arg is JsFunction) {
+						//convert to deledate
+						//check if the target need delegate
+						var func = (JsFunction)arg;
+						//create delegate for a specific target type***
+						parameters[i] = func.MakeDelegate(_parameterInfoList[i].ParameterType);
+					} else {
+						parameters[i] = arg;
+					}
+				}
+
+				//send to .net 
+				object result = _method.Invoke(thisArg, parameters);
+
+				if (_isReturnTypeVoid) {
+					//set to undefine because of void
+					args.SetResultUndefined();
+				} else {
+					args.SetResultObj(result);
+				}
+			} else {
+				_methodCallDel(args);
+			}
+		}
 
 
 
@@ -329,100 +285,84 @@ public override string ToString()
             return this.MemberName;
         }
 #endif
-    }
-
-    public delegate void JsMethodCallDel(ManagedMethodArgs args);
-
-    public struct JsArgValue
-    {
-        JsValue jsvalue;
-    }
-
-
-    public struct ManagedMethodArgs
-    {
-        IntPtr _metArgsPtr;
-        JsContext _context;
-        public ManagedMethodArgs(JsContext context, IntPtr metArgsPtr)
-        {
-            _context = context;
-            _metArgsPtr = metArgsPtr;
-        }
-        public int ArgCount => NativeV8JsInterOp.ArgCount(_metArgsPtr);
-
-        public object GetThisArg()
-        {
-            JsValue output = new JsValue();
-            NativeV8JsInterOp.ArgGetThis(_metArgsPtr, ref output);
-            return _context.Converter.FromJsValue(ref output);
-        }
-        public object GetArgAsObject(int index)
-        {
-            JsValue output = new JsValue();
-            NativeV8JsInterOp.ArgGetObject(_metArgsPtr, index, ref output);
-            return _context.Converter.FromJsValue(ref output);
-        }
-        //--------------------------------------------------------------------
-        public void SetResult(bool value)
-        {
-            NativeV8JsInterOp.ResultSetBool(_metArgsPtr, value);
-        }
-        public void SetResult(int value)
-        {
-            NativeV8JsInterOp.ResultSetInt32(_metArgsPtr, value);
-        }
-        public void SetResult(string value)
-        {
-            NativeV8JsInterOp.ResultSetString(_metArgsPtr, value);
-        }
-        public void SetResult(double value)
-        {
-            NativeV8JsInterOp.ResultSetDouble(_metArgsPtr, value);
-        }
-        public void SetResult(float value)
-        {
-            NativeV8JsInterOp.ResultSetFloat(_metArgsPtr, value);
-        }
-        public void SetResultNull()
-        {
-            NativeV8JsInterOp.ResultSetJsNull(_metArgsPtr);
-        }
-        public void SetResultUndefined()
-        {
-            //TODO: review here again
-            NativeV8JsInterOp.ResultSetJsVoid(_metArgsPtr);
-        }
-        public void SetResultObj(object result)
-        {
-            JsValue output = new JsValue();
-            _context.Converter.AnyToJsValue(result, ref output);
-            NativeV8JsInterOp.ResultSetValue(_metArgsPtr, ref output);
-        }
-
-        public void SetResultObj(object result, JsTypeDefinition jsTypeDef)
-        {
-            if (!jsTypeDef.IsRegisterd)
-            {
-                _context.RegisterTypeDefinition(jsTypeDef);
-            }
-
-            INativeScriptable proxy = _context.CreateWrapper(result, jsTypeDef);
-            JsValue output = new JsValue();
-            _context.Converter.ToJsValue(proxy, ref output);
-            NativeV8JsInterOp.ResultSetValue(_metArgsPtr, ref output);
-        }
-        public void SetResultAutoWrap<T>(T result)
-            where T : class, new()
-        {
-
-            Type actualType = result.GetType();
-            JsTypeDefinition jsTypeDef = _context.GetJsTypeDefinition(actualType);
-            INativeScriptable proxy = _context.CreateWrapper(result, jsTypeDef);
-            JsValue output = new JsValue();
-            _context.Converter.ToJsValue(proxy, ref output);
-            NativeV8JsInterOp.ResultSetValue(_metArgsPtr, ref output);
-
-        }
-
-    }
+	}
+
+	public delegate void JsMethodCallDel(ManagedMethodArgs args);
+
+	public struct JsArgValue {
+		JsValue jsvalue;
+	}
+
+
+	public struct ManagedMethodArgs {
+		IntPtr _metArgsPtr;
+		JsContext _context;
+		public ManagedMethodArgs(JsContext context, IntPtr metArgsPtr) {
+			_context = context;
+			_metArgsPtr = metArgsPtr;
+		}
+		public int ArgCount => NativeV8JsInterOp.ArgCount(_metArgsPtr);
+
+		public object GetThisArg() {
+			JsValue output = new JsValue();
+			NativeV8JsInterOp.ArgGetThis(_metArgsPtr, ref output);
+			return _context.Converter.FromJsValue(ref output);
+		}
+		public object GetArgAsObject(int index) {
+			JsValue output = new JsValue();
+			NativeV8JsInterOp.ArgGetObject(_metArgsPtr, index, ref output);
+			return _context.Converter.FromJsValue(ref output);
+		}
+		//--------------------------------------------------------------------
+		public void SetResult(bool value) {
+			NativeV8JsInterOp.ResultSetBool(_metArgsPtr, value);
+		}
+		public void SetResult(int value) {
+			NativeV8JsInterOp.ResultSetInt32(_metArgsPtr, value);
+		}
+		public void SetResult(string value) {
+			NativeV8JsInterOp.ResultSetString(_metArgsPtr, value);
+		}
+		public void SetResult(double value) {
+			NativeV8JsInterOp.ResultSetDouble(_metArgsPtr, value);
+		}
+		public void SetResult(float value) {
+			NativeV8JsInterOp.ResultSetFloat(_metArgsPtr, value);
+		}
+		public void SetResultNull() {
+			NativeV8JsInterOp.ResultSetJsNull(_metArgsPtr);
+		}
+		public void SetResultUndefined() {
+			//TODO: review here again
+			NativeV8JsInterOp.ResultSetJsVoid(_metArgsPtr);
+		}
+		public void SetResultObj(object result) {
+			JsValue output = new JsValue();
+			_context.Converter.AnyToJsValue(result, ref output);
+			NativeV8JsInterOp.ResultSetValue(_metArgsPtr, ref output);
+		}
+
+		public void SetResultObj(object result, JsTypeDefinition jsTypeDef) {
+			if (!jsTypeDef.IsRegisterd) {
+				_context.RegisterTypeDefinition(jsTypeDef);
+			}
+
+			INativeScriptable proxy = _context.CreateWrapper(result, jsTypeDef);
+			JsValue output = new JsValue();
+			_context.Converter.ToJsValue(proxy, ref output);
+			NativeV8JsInterOp.ResultSetValue(_metArgsPtr, ref output);
+		}
+		public void SetResultAutoWrap<T>(T result)
+			where T : class, new() {
+
+			Type actualType = result.GetType();
+			JsTypeDefinition jsTypeDef = _context.GetJsTypeDefinition(actualType);
+			INativeScriptable proxy = _context.CreateWrapper(result, jsTypeDef);
+			JsValue output = new JsValue();
+			_context.Converter.ToJsValue(proxy, ref output);
+			NativeV8JsInterOp.ResultSetValue(_metArgsPtr, ref output);
+
+		}
+
+	}
 }
\ No newline at end of file
diff --git a/src/1_Core/JsContext.cs b/src/1_Core/JsContext.cs
index 44d7004c..590616b7 100644
--- a/src/1_Core/JsContext.cs
+++ b/src/1_Core/JsContext.cs
@@ -46,8 +46,9 @@ public partial class JsContext : IDisposable
         readonly HandleRef _context; //native js context
         readonly Action<int> _notifyDispose;
 
-        List<JsMethodDefinition> _registerMethods = new List<JsMethodDefinition>();
-        List<JsPropertyDefinition> _registerProperties = new List<JsPropertyDefinition>();
+		static List<JsMethodDefinition> _registerMethods;
+        static List<JsPropertyDefinition> _registerProperties;
+		static JsContext instance;
 
         Dictionary<Type, JsTypeDefinition> _mappingJsTypeDefinition = new Dictionary<Type, JsTypeDefinition>();
         Dictionary<Type, DelegateTemplate> _cachedDelSamples = new Dictionary<Type, DelegateTemplate>();
@@ -86,10 +87,13 @@ internal JsContext(int id,
             _convert = new JsConvert(this);
 
             _jsTypeDefBuilder = jsTypeDefBuilder;
+			instance = this;
 
-            _engineMethodCallbackDel = new ManagedMethodCallDel(EngineListener_MethodCall);
+			_engineMethodCallbackDel = new ManagedMethodCallDel(EngineListener_MethodCall);
             NativeV8JsInterOp.CtxRegisterManagedMethodCall(this, _engineMethodCallbackDel);
-            _registerMethods.Add(null);//first is null
+			_registerMethods = new List<JsMethodDefinition>();
+			_registerMethods.Add(null);//first is null
+			_registerProperties = new List<JsPropertyDefinition>();
             _registerProperties.Add(null); //first is null 
             _proxyStore = new NativeObjectProxyStore(this);
         }
@@ -122,7 +126,8 @@ internal void CollectionTypeMembers(JsTypeDefinition jsTypeDefinition)
 
         }
 
-        void EngineListener_MethodCall(int mIndex, int methodKind, IntPtr metArgs)
+		[MonoPInvokeCallback(typeof(ManagedMethodCallDel))]
+        static void EngineListener_MethodCall(int mIndex, int methodKind, IntPtr metArgs)
         {
             switch (methodKind)
             {
@@ -135,7 +140,7 @@ void EngineListener_MethodCall(int mIndex, int methodKind, IntPtr metArgs)
 
                         if (getterMethod != null)
                         {
-                            getterMethod.InvokeMethod(new ManagedMethodArgs(this, metArgs));
+                            getterMethod.InvokeMethod(new ManagedMethodArgs(instance, metArgs));
                         }
 
                     }
@@ -148,7 +153,7 @@ void EngineListener_MethodCall(int mIndex, int methodKind, IntPtr metArgs)
                         JsMethodDefinition setterMethod = _registerProperties[mIndex].SetterMethod;
                         if (setterMethod != null)
                         {
-                            setterMethod.InvokeMethod(new ManagedMethodArgs(this, metArgs));
+                            setterMethod.InvokeMethod(new ManagedMethodArgs(instance, metArgs));
                         }
                     }
                     break;
@@ -158,7 +163,7 @@ void EngineListener_MethodCall(int mIndex, int methodKind, IntPtr metArgs)
                         JsMethodDefinition foundMet = _registerMethods[mIndex];
                         if (foundMet != null)
                         {
-                            foundMet.InvokeMethod(new ManagedMethodArgs(this, metArgs));
+                            foundMet.InvokeMethod(new ManagedMethodArgs(instance, metArgs));
                         }
                     }
                     break;
diff --git a/src/1_Core/JsEngine.NativeMethods.cs b/src/1_Core/JsEngine.NativeMethods.cs
index 3ea6c915..cae48b5e 100644
--- a/src/1_Core/JsEngine.NativeMethods.cs
+++ b/src/1_Core/JsEngine.NativeMethods.cs
@@ -8,8 +8,7 @@
 namespace Espresso
 {
 
-
-    partial class JsEngine : IDisposable
+	partial class JsEngine : IDisposable
     {
 
         delegate void KeepaliveRemoveDelegate(int context, int slot);
diff --git a/src/1_Core/JsEngine.cs b/src/1_Core/JsEngine.cs
index faeada94..367adbb7 100644
--- a/src/1_Core/JsEngine.cs
+++ b/src/1_Core/JsEngine.cs
@@ -4,13 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Linq;
 using System.Threading;
 
-namespace Espresso
-{
-    public partial class JsEngine : IDisposable
-    {
+namespace Espresso {
+	public class MonoPInvokeCallbackAttribute : Attribute {
+		private Type type;
+		public MonoPInvokeCallbackAttribute(Type t) { type = t; }
+	}
 
+	public partial class JsEngine : IDisposable
+    {
         readonly KeepaliveRemoveDelegate _keepalive_remove;
         readonly KeepAliveGetPropertyValueDelegate _keepalive_get_property_value;
         readonly KeepAliveSetPropertyValueDelegate _keepalive_set_property_value;
@@ -19,8 +23,8 @@ public partial class JsEngine : IDisposable
         readonly KeepAliveDeletePropertyDelegate _keepalive_delete_property;
         readonly KeepAliveEnumeratePropertiesDelegate _keepalive_enumerate_properties;
 
-        readonly Dictionary<int, JsContext> _aliveContexts = new Dictionary<int, JsContext>();
-        readonly Dictionary<int, JsScript> _aliveScripts = new Dictionary<int, JsScript>();
+		static readonly Dictionary<int, JsContext> _aliveContexts = new Dictionary<int, JsContext>();
+		static readonly Dictionary<int, JsScript> _aliveScripts = new Dictionary<int, JsScript>();
 
         int _currentContextId = 0;
         int _currentScriptId = 0;
@@ -125,7 +129,8 @@ public void DisposeObject(IntPtr ptr)
                 jsengine_dispose_object(_engine, ptr);
         }
 
-        void KeepAliveValueOf(int contextId, int slot, ref JsValue output)
+		[MonoPInvokeCallback(typeof(KeepAliveValueOfDelegate))]
+		static void KeepAliveValueOf(int contextId, int slot, ref JsValue output)
         {
 
             if (!_aliveContexts.TryGetValue(contextId, out JsContext context))
@@ -135,8 +140,8 @@ void KeepAliveValueOf(int contextId, int slot, ref JsValue output)
             }
             context.KeepAliveGetValueOf(slot, ref output);
         }
-
-        void KeepAliveInvoke(int contextId, int slot, ref JsValue args, ref JsValue output)
+		[MonoPInvokeCallback(typeof(KeepAliveInvokeDelegate))]
+		static void KeepAliveInvoke(int contextId, int slot, ref JsValue args, ref JsValue output)
         {
 
             if (!_aliveContexts.TryGetValue(contextId, out JsContext context))
@@ -145,7 +150,8 @@ void KeepAliveInvoke(int contextId, int slot, ref JsValue args, ref JsValue outp
             }
             context.KeepAliveInvoke(slot, ref args, ref output);
         }
-        void KeepAliveSetPropertyValue(int contextId, int slot, string name, ref JsValue value, ref JsValue output)
+		[MonoPInvokeCallback(typeof(KeepAliveSetPropertyValueDelegate))]
+		static void KeepAliveSetPropertyValue(int contextId, int slot, string name, ref JsValue value, ref JsValue output)
         {
 #if DEBUG_TRACE_API
 			Console.WriteLine("set prop " + contextId + " " + slot);
@@ -157,7 +163,8 @@ void KeepAliveSetPropertyValue(int contextId, int slot, string name, ref JsValue
             }
             context.KeepAliveSetPropertyValue(slot, name, ref value, ref output);
         }
-        void KeepAliveGetPropertyValue(int contextId, int slot, string name, ref JsValue output)
+		[MonoPInvokeCallback(typeof(KeepAliveGetPropertyValueDelegate))]
+		static void KeepAliveGetPropertyValue(int contextId, int slot, string name, ref JsValue output)
         {
 #if DEBUG_TRACE_API
 			Console.WriteLine("get prop " + contextId + " " + slot);
@@ -169,7 +176,8 @@ void KeepAliveGetPropertyValue(int contextId, int slot, string name, ref JsValue
             }
             context.KeepAliveGetPropertyValue(slot, name, ref output);
         }
-        void KeepAliveDeleteProperty(int contextId, int slot, string name, ref JsValue output)
+		[MonoPInvokeCallback(typeof(KeepAliveDeletePropertyDelegate))]
+		static void KeepAliveDeleteProperty(int contextId, int slot, string name, ref JsValue output)
         {
 #if DEBUG_TRACE_API
 			Console.WriteLine("delete prop " + contextId + " " + slot);
@@ -180,8 +188,8 @@ void KeepAliveDeleteProperty(int contextId, int slot, string name, ref JsValue o
             }
             context.KeepAliveDeleteProperty(slot, name, ref output);
         }
-
-        void KeepAliveEnumerateProperties(int contextId, int slot, ref JsValue output)
+		[MonoPInvokeCallback(typeof(KeepAliveEnumeratePropertiesDelegate))]
+		static void KeepAliveEnumerateProperties(int contextId, int slot, ref JsValue output)
         {
 #if DEBUG_TRACE_API
 			Console.WriteLine("enumerate props " + contextId + " " + slot);
@@ -193,7 +201,8 @@ void KeepAliveEnumerateProperties(int contextId, int slot, ref JsValue output)
             }
             context.KeepAliveEnumerateProperties(slot, ref output);
         }
-        void KeepAliveRemove(int contextId, int slot)
+		[MonoPInvokeCallback(typeof(KeepaliveRemoveDelegate))]
+		static void KeepAliveRemove(int contextId, int slot)
         {
 #if DEBUG_TRACE_API
 			Console.WriteLine("Keep alive remove for " + contextId + " " + slot);
@@ -295,7 +304,7 @@ protected virtual void Dispose(bool disposing)
                 }
                 _aliveContexts.Clear();
                 //
-                foreach (JsScript script in _aliveScripts.Values)
+                foreach (JsScript script in _aliveScripts.Values.ToArray())
                 {
                     script.Dispose();
                 }
diff --git a/src/3_MiniBridge/NativeV8JsInterOp.cs b/src/3_MiniBridge/NativeV8JsInterOp.cs
index 609b5fb3..6f64eaa0 100644
--- a/src/3_MiniBridge/NativeV8JsInterOp.cs
+++ b/src/3_MiniBridge/NativeV8JsInterOp.cs
@@ -141,7 +141,7 @@ static class NativeV8JsInterOp
         public static extern int TestCallBack();
 
         [DllImport(JsBridge.LIB_NAME, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void V8Init();
+        public static extern void V8Init(string location);
 
         [DllImport(JsBridge.LIB_NAME, CallingConvention = CallingConvention.Cdecl)]
         static extern IntPtr CreateWrapperForManagedObject(IntPtr unmanagedEnginePtr, int mIndex, IntPtr rtTypeDefinition);