diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0fcb27e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,331 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+.vs/
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+output/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
+[Bb]in/
+[Oo]bj/
+
+# mstest test results
+TestResults
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+x64/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.log
+*.vspscc
+*.vssscc
+.builds
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder 
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Publish Web Output
+*.Publish.xml
+
+# NuGet Packages Directory
+packages
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+[Tt]est[Rr]esult*
+*.Cache
+ClientBin
+[Ss]tyle[Cc]op.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+*.DotSettings
+clrdev.setting
+.DS_Store
\ No newline at end of file
diff --git a/UnitTests/Program.cs b/UnitTests/Program.cs
new file mode 100644
index 0000000..3f440e7
--- /dev/null
+++ b/UnitTests/Program.cs
@@ -0,0 +1,12 @@
+
+namespace Test
+{
+    static class Program
+    {
+        static void Main()
+        {
+            //tests.CustomTypes_Generic();
+            tests.CustomTypes_Generic2();
+        }
+    }
+}
\ No newline at end of file
diff --git a/UnitTests/Tests.cs b/UnitTests/Tests.cs
index 1905dbe..a31d7e3 100644
--- a/UnitTests/Tests.cs
+++ b/UnitTests/Tests.cs
@@ -291,7 +291,7 @@ public class RetNestedclass
 
     #endregion
 
-    [TestFixtureSetUp]
+    [OneTimeSetUp]
     public static void setup()
     {
         //fastJSON.JSON.Parameters = new JSONParameters();
@@ -1864,24 +1864,202 @@ public static void comments()
         Assert.AreEqual(2, (o as IDictionary).Count);
     }
 
-    public class ctype
+    public struct Point
     {
-        public System.Net.IPAddress ip;
+        public int x;
+        public float y;
+    }
+    public class Complex
+    {
+        public int i;
+        public List<Point[]> l;
     }
     [Test]
-    public static void CustomTypes()
+    public static void CustomTypes_Generic()
+    {
+        JSON.RegisterCustomType<Point>(
+             pt => string.Format("[{0},{1}]", pt.x, pt.y),
+             (o, cb) =>
+             {
+                 var l = o as List<object>;
+                 return new Point() { x = Convert.ToInt32(l[0]), y = Convert.ToSingle(l[1]) };
+             });
+        //
+        JSON.RegisterCustomType<Complex>(
+             c => string.Format("[{0},{1}]", c.i, JSON.ToJSON(c.l)),
+            (o, cb) =>
+            {
+                var l = o as List<object>;
+                return new Complex() { i = Convert.ToInt32(l[0]), l = (List<Point[]>)cb(l[1], typeof(List<Point[]>)) };
+            });
+
+        var pt1 = new Point() { x = 1, y = 2.3f };
+        var s = JSON.ToJSON(pt1);
+        Console.WriteLine(s);
+        var pt2 = JSON.ToObject<Point>(s);
+        Assert.AreEqual(pt1, pt2);
+
+        var c1 = new Complex()
+        {
+            i = 9,
+            l = new List<Point[]>() {
+            new Point[] {
+              new Point() { x = 1, y = 2.3f },
+              new Point() { x = 2, y = 3.4f },
+            },
+            new Point[] {
+              new Point() { x = 5, y = 6.7f },
+            },
+          }
+        };
+        s = JSON.ToJSON(c1);
+        Console.WriteLine(s);
+        var c2 = JSON.ToObject<Complex>(s);
+        Assert.AreEqual(s, JSON.ToJSON(c2));
+
+        var d1 = new Dictionary<string, List<List<Point>>>() {
+          {"a", new List<List<Point>> {
+            new List<Point> {
+              new Point() { x = 1, y = 2.3f },
+              new Point() { x = 2, y = 3.4f },
+            },
+            new List<Point> {
+              new Point() { x = 5, y = 6.7f },
+            },
+          }}
+        };
+        s = JSON.ToJSON(d1);
+        Console.WriteLine(s);
+        var d2 = JSON.ToObject(s, d1.GetType());
+        Assert.AreEqual(s, JSON.ToJSON(d2));
+    }
+
+
+    [Test]
+    public static void CustomTypes_Generic2()
     {
-        var ip = new ctype();
-        ip.ip = System.Net.IPAddress.Loopback;
+        JSON.RegisterCustomType<Point, List<object>>(
+             //since we know that our point will be serialized to list of objects
+             pt => string.Format("[{0},{1}]", pt.x, pt.y),
+             (l, cb) =>
+             {
+                 return new Point() { x = Convert.ToInt32(l[0]), y = Convert.ToSingle(l[1]) };
+             });
+        //
+        JSON.RegisterCustomType<Complex, List<object>>(
+            //since we know that our complex type will be serialized to list of objects
+            c => string.Format("[{0},{1}]", c.i, JSON.ToJSON(c.l)),
+            (l, cb) =>
+            {
+                return new Complex() { i = Convert.ToInt32(l[0]), l = (List<Point[]>)cb(l[1], typeof(List<Point[]>)) };
+            });
+
+        //----------------
+        var pt1 = new Point() { x = 1, y = 2.3f };
+        var s = JSON.ToJSON(pt1);
+        Console.WriteLine(s);
+        var pt2 = JSON.ToObject<Point>(s);
+        Assert.AreEqual(pt1, pt2);
 
-        JSON.RegisterCustomType(typeof(System.Net.IPAddress),
-            (x) => { return x.ToString(); },
-            (x) => { return System.Net.IPAddress.Parse(x); });
+        var c1 = new Complex()
+        {
+            i = 9,
+            l = new List<Point[]>() {
+            new Point[] {
+              new Point() { x = 1, y = 2.3f },
+              new Point() { x = 2, y = 3.4f },
+            },
+            new Point[] {
+              new Point() { x = 5, y = 6.7f },
+            },
+          }
+        };
+        s = JSON.ToJSON(c1);
+        Console.WriteLine(s);
+        var c2 = JSON.ToObject<Complex>(s);
+        Assert.AreEqual(s, JSON.ToJSON(c2));
+
+        var d1 = new Dictionary<string, List<List<Point>>>() {
+          {"a", new List<List<Point>> {
+            new List<Point> {
+              new Point() { x = 1, y = 2.3f },
+              new Point() { x = 2, y = 3.4f },
+            },
+            new List<Point> {
+              new Point() { x = 5, y = 6.7f },
+            },
+          }}
+        };
+        s = JSON.ToJSON(d1);
+        Console.WriteLine(s);
+        var d2 = JSON.ToObject(s, d1.GetType());
+        Assert.AreEqual(s, JSON.ToJSON(d2));
+    }
+    [Test]
+    public static void CustomTypes()
+    {
+        JSON.RegisterCustomType(typeof(Point),
+            (o) =>
+            {
+                var pt = (Point)o;
+                return string.Format("[{0},{1}]", pt.x, pt.y);
+            },
+            (o, cb) =>
+            {
+                var l = o as List<object>;
+                return new Point() { x = Convert.ToInt32(l[0]), y = Convert.ToSingle(l[1]) };
+            });
+        JSON.RegisterCustomType(typeof(Complex),
+            (o) =>
+            {
+                var c = (Complex)o;
+                return string.Format("[{0},{1}]", c.i, JSON.ToJSON(c.l));
+            },
+            (o, cb) =>
+            {
+                var l = o as List<object>;
+                return new Complex() { i = Convert.ToInt32(l[0]), l = (List<Point[]>)cb(l[1], typeof(List<Point[]>)) };
+            });
 
-        var s = JSON.ToJSON(ip);
+        var pt1 = new Point() { x = 1, y = 2.3f };
+        var s = JSON.ToJSON(pt1);
+        Console.WriteLine(s);
+        var pt2 = JSON.ToObject<Point>(s);
+        Assert.AreEqual(pt1, pt2);
 
-        var o = JSON.ToObject<ctype>(s);
-        Assert.AreEqual(ip.ip, o.ip);
+        var c1 = new Complex()
+        {
+            i = 9,
+            l = new List<Point[]>() {
+            new Point[] {
+              new Point() { x = 1, y = 2.3f },
+              new Point() { x = 2, y = 3.4f },
+            },
+            new Point[] {
+              new Point() { x = 5, y = 6.7f },
+            },
+          }
+        };
+        s = JSON.ToJSON(c1);
+        Console.WriteLine(s);
+        var c2 = JSON.ToObject<Complex>(s);
+        Assert.AreEqual(s, JSON.ToJSON(c2));
+
+        var d1 = new Dictionary<string, List<List<Point>>>() {
+          {"a", new List<List<Point>> {
+            new List<Point> {
+              new Point() { x = 1, y = 2.3f },
+              new Point() { x = 2, y = 3.4f },
+            },
+            new List<Point> {
+              new Point() { x = 5, y = 6.7f },
+            },
+          }}
+        };
+        s = JSON.ToJSON(d1);
+        Console.WriteLine(s);
+        var d2 = JSON.ToObject(s, d1.GetType());
+        Assert.AreEqual(s, JSON.ToJSON(d2));
     }
 
     [Test]
@@ -2813,18 +2991,18 @@ public static void ConvertTest()
         var data2 = JSON.ToObject<TestData>(jsonData);
 
         // OK, since data member name is "foo" which is all in lower case
-        Assert.AreEqual(data.Foo ,data2.Foo);
+        Assert.AreEqual(data.Foo, data2.Foo);
 
         // Fails, since data member name is "Bar", but the library looks for "bar" when setting the value
-        Assert.AreEqual(data.Bar , data2.Bar);
+        Assert.AreEqual(data.Bar, data2.Bar);
     }
 
 
-    public class test {   }
+    public class test { }
     [Test]
     public static void ArrayOfObjectExtOff()
     {
-        var s = JSON.ToJSON(new test[] { new test(), new test() }, new JSONParameters { UseExtensions = false});
+        var s = JSON.ToJSON(new test[] { new test(), new test() }, new JSONParameters { UseExtensions = false });
         var o = JSON.ToObject<test[]>(s);
         Console.WriteLine(o.GetType().ToString());
         Assert.AreEqual(typeof(test[]), o.GetType());
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index ce328b1..c7bccba 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F4BFF0D2-45F6-413B-B1E7-BC4A0D6596FC}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTests</RootNamespace>
     <AssemblyName>UnitTests</AssemblyName>
@@ -21,6 +22,8 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,21 +45,33 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework" />
     <Reference Include="nunit.framework">
       <HintPath>C:\Program Files (x86)\NUnit 2.6.4\bin\framework\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.10.1\lib\net40\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tests.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\fastJSON\fastJSON.csproj">
       <Project>{207e91b1-c9f8-4913-88e1-3549ef5f3273}</Project>
@@ -64,6 +79,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/UnitTests/packages.config b/UnitTests/packages.config
new file mode 100644
index 0000000..51ddc66
--- /dev/null
+++ b/UnitTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.10.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/fastJSON/JSON.cs b/fastJSON/JSON.cs
index fc2434c..bad08fe 100644
--- a/fastJSON/JSON.cs
+++ b/fastJSON/JSON.cs
@@ -10,8 +10,14 @@
 
 namespace fastJSON
 {
+    public delegate object DeserializeCallback(object data, Type type);
     public delegate string Serialize(object data);
-    public delegate object Deserialize(string data);
+    public delegate object Deserialize(object data, DeserializeCallback cb);
+
+    //
+    public delegate string Serialize2<T>(T data);
+    public delegate T Deserialize2<T>(object data, DeserializeCallback cb);
+    public delegate T Deserialize3<T, U>(U data, DeserializeCallback cb);
 
     public sealed class JSONParameters
     {
@@ -312,6 +318,15 @@ public static void RegisterCustomType(Type type, Serialize serializer, Deseriali
         {
             Reflection.Instance.RegisterCustomType(type, serializer, deserializer);
         }
+
+        public static void RegisterCustomType<T>(Serialize2<T> serializer, Deserialize2<T> deserializer)
+        {
+            Reflection.Instance.RegisterCustomType(typeof(T), serializer, deserializer);
+        }
+        public static void RegisterCustomType<T, U>(Serialize2<T> serializer, Deserialize3<T, U> deserializer)
+        {
+            Reflection.Instance.RegisterCustomType(typeof(T), serializer, deserializer);
+        }
         /// <summary>
         /// Clear the internal reflection cache so you can start from new (you will loose performance)
         /// </summary>
@@ -382,6 +397,12 @@ public object ToObject(string json)
         }
 
         public object ToObject(string json, Type type)
+        {
+            object o = new JsonParser(json).Decode();
+            return ToTyped(o, type);
+        }
+
+        public object ToTyped(object o, Type type)
         {
             //_params = Parameters;
             _params.FixValues();
@@ -392,7 +413,9 @@ public object ToObject(string json, Type type)
                 _params.UsingGlobalTypes = false;
             _usingglobals = _params.UsingGlobalTypes;
 
-            object o = new JsonParser(json).Decode();
+            if ((type != null) && Reflection.Instance.IsTypeRegistered(type))
+                return Reflection.Instance.CreateCustom(o, type, ToTyped);
+
             if (o == null)
                 return null;
 #if !SILVERLIGHT
@@ -490,9 +513,6 @@ private object ChangeType(object value, Type conversionType)
             else if (conversionType == typeof(DateTimeOffset))
                 return CreateDateTimeOffset((string)value);
 
-            else if (Reflection.Instance.IsTypeRegistered(conversionType))
-                return Reflection.Instance.CreateCustom((string)value, conversionType);
-
             // 8-30-2014 - James Brooks - Added code for nullable types.
             if (IsNullable(conversionType))
             {
@@ -612,8 +632,17 @@ private void DoParseList(object parse, Type it, IList o)
             {
                 _usingglobals = false;
                 object v = k;
-                if (k is Dictionary<string, object>)
+                if ((it != null) && Reflection.Instance.IsTypeRegistered(it))
+                    v = Reflection.Instance.CreateCustom(k, it, ToTyped);
+                else if (k is Dictionary<string, object>)
                     v = ParseDictionary(k as Dictionary<string, object>, globals, it, null);
+                else if (k is List<object>)
+                {
+                    if (it != null && it.IsArray)
+                        v = RootArray(k, it);
+                    else
+                        v = RootList(k, it);
+                }
                 else
                     v = ChangeType(k, it);
 
@@ -682,6 +711,8 @@ internal object ParseDictionary(Dictionary<string, object> d, Dictionary<string,
                 return CreateNV(d);
             if (type == typeof(StringDictionary))
                 return CreateSD(d);
+            if ((type != null) && type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(Dictionary<,>)))
+                return RootDictionary(d, type);
 
             if (d.TryGetValue("$i", out tn))
             {
@@ -789,7 +820,7 @@ internal object ParseDictionary(Dictionary<string, object> d, Dictionary<string,
                             case myPropInfoType.StringKeyDictionary: oset = CreateStringKeyDictionary((Dictionary<string, object>)v, pi.pt, pi.GenericTypes, globaltypes); break;
                             case myPropInfoType.NameValue: oset = CreateNV((Dictionary<string, object>)v); break;
                             case myPropInfoType.StringDictionary: oset = CreateSD((Dictionary<string, object>)v); break;
-                            case myPropInfoType.Custom: oset = Reflection.Instance.CreateCustom((string)v, pi.pt); break;
+                            case myPropInfoType.Custom: oset = Reflection.Instance.CreateCustom(v, pi.pt, ToTyped); break;
                             default:
                                 {
                                     if (pi.IsGenericType && pi.IsValueType == false && v is List<object>)
@@ -997,13 +1028,12 @@ private object CreateGenericList(List<object> data, Type pt, Type bt, Dictionary
                 {
                     if (ob is IDictionary)
                         col.Add(ParseDictionary((Dictionary<string, object>)ob, globalTypes, it, null));
-
                     else if (ob is List<object>)
                     {
-                        if (bt.IsGenericType)
-                            col.Add((List<object>)ob);//).ToArray());
+                        if (it.IsArray)
+                            col.Add(RootArray(ob, it));
                         else
-                            col.Add(((List<object>)ob).ToArray());
+                            col.Add(RootList(ob, it));
                     }
                     else
                         col.Add(ChangeType(ob, it));
diff --git a/fastJSON/JsonSerializer.cs b/fastJSON/JsonSerializer.cs
index 8aaebf8..62571cd 100644
--- a/fastJSON/JsonSerializer.cs
+++ b/fastJSON/JsonSerializer.cs
@@ -161,7 +161,7 @@ obj is uint || obj is ulong
         private void WriteDateTimeOffset(DateTimeOffset d)
         {
             DateTime dt = _params.UseUTCDateTime ? d.UtcDateTime : d.DateTime;
-            
+
             write_date_value(dt);
 
             var ticks = dt.Ticks % TimeSpan.TicksPerSecond;
@@ -236,9 +236,9 @@ private void WriteSD(StringDictionary stringDictionary)
 
         private void WriteCustom(object obj)
         {
-            Serialize s;
-            Reflection.Instance._customSerializer.TryGetValue(obj.GetType(), out s);
-            WriteStringFast(s(obj));
+            Reflection.MySerializer ser;
+            Reflection.Instance._customSerializer.TryGetValue(obj.GetType(), out ser);
+            WriteRaw(ser.Invoke(obj));
         }
 
         private void WriteEnum(Enum e)
@@ -645,7 +645,7 @@ private void WriteString(string s)
                 }
                 else
                 {
-                    if (c != '\t' && c != '\n' && c != '\r' && c != '\"' && c != '\\' && c!='\0')// && c != ':' && c!=',')
+                    if (c != '\t' && c != '\n' && c != '\r' && c != '\"' && c != '\\' && c != '\0')// && c != ':' && c!=',')
                     {
                         if (runIndex == -1)
                             runIndex = index;
@@ -686,5 +686,10 @@ private void WriteString(string s)
 
             _output.Append('\"');
         }
+
+        private void WriteRaw(string s)
+        {
+            _output.Append(s);
+        }
     }
 }
diff --git a/fastJSON/Reflection.cs b/fastJSON/Reflection.cs
index 42aac40..d46d380 100644
--- a/fastJSON/Reflection.cs
+++ b/fastJSON/Reflection.cs
@@ -100,32 +100,118 @@ private Reflection()
 
         #region json custom types
         // JSON custom
-        internal SafeDictionary<Type, Serialize> _customSerializer = new SafeDictionary<Type, Serialize>();
-        internal SafeDictionary<Type, Deserialize> _customDeserializer = new SafeDictionary<Type, Deserialize>();
+        internal SafeDictionary<Type, MySerializer> _customSerializer = new SafeDictionary<Type, MySerializer>();
+        internal SafeDictionary<Type, MyDeserializer> _customDeserializer = new SafeDictionary<Type, MyDeserializer>();
 
-        internal object CreateCustom(string v, Type type)
+
+        internal class MySerializer
+        {
+            Serialize _ser;
+            public MySerializer(Serialize ser)
+            {
+                _ser = ser;
+            }
+            public virtual string Invoke(object obj)
+            {
+                return _ser(obj);
+            }
+
+        }
+        internal class MySerializer<T> : MySerializer
+        {
+            Serialize2<T> _ser;
+            public MySerializer(Serialize2<T> ser)
+                : base(null)
+            {
+                this._ser = ser;
+            }
+            public override string Invoke(object obj)
+            {
+                return _ser((T)obj);
+            }
+        }
+
+        internal class MyDeserializer
+        {
+            Deserialize _deser;
+            public MyDeserializer(Deserialize deser)
+            {
+                this._deser = deser;
+            }
+            public virtual object Invoke(object data, DeserializeCallback cb)
+            {
+                return _deser(data, cb);
+            }
+        }
+        internal class MyDeserializer<T> : MyDeserializer
+        {
+            Deserialize2<T> _deser;
+            public MyDeserializer(Deserialize2<T> deser)
+                : base(null)
+            {
+                this._deser = deser;
+            }
+            public override object Invoke(object data, DeserializeCallback cb)
+            {
+                return _deser(data, cb);
+            }
+        }
+        internal class MyDeserializer<T, U> : MyDeserializer
         {
-            Deserialize d;
+            Deserialize3<T, U> _deser;
+            public MyDeserializer(Deserialize3<T, U> deser)
+                : base(null)
+            {
+                this._deser = deser;
+            }
+            public override object Invoke(object data, DeserializeCallback cb)
+            {
+                return _deser((U)data, cb);
+            }
+        }
+
+        internal object CreateCustom(object v, Type type, DeserializeCallback cb)
+        {
+            MyDeserializer d;
             _customDeserializer.TryGetValue(type, out d);
-            return d(v);
+            return d.Invoke(v, cb);
         }
 
         internal void RegisterCustomType(Type type, Serialize serializer, Deserialize deserializer)
         {
             if (type != null && serializer != null && deserializer != null)
             {
-                _customSerializer.Add(type, serializer);
-                _customDeserializer.Add(type, deserializer);
+                _customSerializer.Add(type, new MySerializer(serializer));
+                _customDeserializer.Add(type, new MyDeserializer(deserializer));
+                // reset property cache
+                Instance.ResetPropertyCache();
+            }
+        }
+        internal void RegisterCustomType<T>(Type type, Serialize2<T> serializer, Deserialize2<T> deserializer)
+        {
+            if (type != null && serializer != null && deserializer != null)
+            {
+                _customSerializer.Add(type, new MySerializer<T>(serializer));
+                _customDeserializer.Add(type, new MyDeserializer<T>(deserializer));
+                // reset property cache
+                Instance.ResetPropertyCache();
+            }
+        }
+        internal void RegisterCustomType<T, U>(Type type, Serialize2<T> serializer, Deserialize3<T, U> deserializer)
+        {
+            if (type != null && serializer != null && deserializer != null)
+            {
+                _customSerializer.Add(type, new MySerializer<T>(serializer));
+                _customDeserializer.Add(type, new MyDeserializer<T, U>(deserializer));
                 // reset property cache
                 Instance.ResetPropertyCache();
             }
         }
-
         internal bool IsTypeRegistered(Type t)
         {
             if (_customSerializer.Count == 0)
                 return false;
-            Serialize s;
+            MySerializer s;
             return _customSerializer.TryGetValue(t, out s);
         }
         #endregion
@@ -295,7 +381,7 @@ private Type GetChangeType(Type conversionType)
             return conversionType;
         }
 
-#region [   PROPERTY GET SET   ]
+        #region [   PROPERTY GET SET   ]
 
         internal string GetTypeAssemblyName(Type t)
         {
@@ -576,7 +662,7 @@ internal Getters[] GetGetters(Type type, bool ShowReadOnlyProperties, List<Type>
                         continue;
                 }
                 string mName = null;
-                #if net4
+#if net4
                 var att = p.GetCustomAttributes(true);
                 foreach (var at in att)
                 {
@@ -589,7 +675,7 @@ internal Getters[] GetGetters(Type type, bool ShowReadOnlyProperties, List<Type>
                         }
                     }
                 }
-                #endif
+#endif
                 GenericGetter g = CreateGetMethod(type, p);
                 if (g != null)
                     getters.Add(new Getters { Getter = g, Name = p.Name, lcName = p.Name.ToLower(), memberName = mName });
@@ -655,7 +741,7 @@ internal Getters[] GetGetters(Type type, bool ShowReadOnlyProperties, List<Type>
 
         //    return false;
         //}
-#endregion
+        #endregion
 
         internal void ResetPropertyCache()
         {