diff --git a/.gitignore b/.gitignore
index 748683d..1a72032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,9 @@ publish/
 *.[Pp]ublish.xml
 *.azurePubxml
 
+# NuGet Packages
+*.nupkg
+
 # NuGet Packages Directory
 packages/
 ## TODO: If the tool you use requires repositories.config uncomment the next line
diff --git a/Contributing.md b/Contributing.md
new file mode 100644
index 0000000..12f4ea2
--- /dev/null
+++ b/Contributing.md
@@ -0,0 +1,7 @@
+Open TODO file, if there is one, and see if there is anywhere you can help.  Otherwise, look at the issues.  
+If you want to contribute, fork https://github.com/keithjjones/ArinWhois.NET and perform your modifications on the "devel" branch.
+If you send a pull request we will review the changes and merge them appropriately.
+
+The "master" branch is always the working code.  The "devel" branch is working code, but it hasn't been accepted into "master" for the entire project.
+Any other branch consisting of new features typically starts with "devel-" and contains the feature's name.  It may or may not be working depending on the contributor.  These
+branches are branched from the "devel" branch.
\ No newline at end of file
diff --git a/LICENSE b/License.md
similarity index 95%
rename from LICENSE
rename to License.md
index a6ca106..b5b981b 100644
--- a/LICENSE
+++ b/License.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 MaxHorstmann
+Copyright (c) 2014 MaxHorstmann, 2016 Keith J. Jones
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index e3bb92d..69a2376 100644
--- a/README.md
+++ b/README.md
@@ -11,46 +11,64 @@ This is a simple .NET client to access the RESTful API programmatically with a s
 Install
 ============
 
-Use the [NuGet](https://www.nuget.org/packages/ArinWhois) package, run the following command in the Package Manager Console:
+Use the [NuGet](https://www.nuget.org/packages/ArinWhois-VS2015) package, run the following command in the Package Manager Console:
 
-    PM> Install-Package ArinWhois
+    PM> Install-Package ArinWhois-VS2015
 
 
 
 Sample Usage
 ============
 
-    var arinClient = new ArinClient();
-    
-    // Check single IP
-    var ipResponse = await arinClient.QueryIpAsync(IPAddress.Parse("69.63.176.0"));
-    
-    Console.WriteLine(ipResponse.Network.Name);
-    Console.WriteLine(ipResponse.Network.NetBlocks.NetBlock.Cidr);
-    
-    // Find out more about organization
-    var orgResponse = await arinClient.QueryResourceAsync(ipResponse.Network.OrgRef.Handle, 
+```csharp
+var arinClient = new ArinClient();
+
+// Check single IP
+var ipResponse = await arinClient.QueryIpAsync(IPAddress.Parse("69.63.176.0"));
+
+Console.WriteLine(ipResponse.Network.Name);
+Console.WriteLine(ipResponse.Network.NetBlocks.NetBlock.Cidr);
+
+// Find out more about organization or customer
+if (ipResponse.Network.OrgRef != null)
+{
+	var orgResponse = await arinClient.QueryResourceAsync(ipResponse.Network.OrgRef.Handle, 
 								ArinClient.ResourceType.Organization);
-    Console.WriteLine(orgResponse.Organization.Name);
-    Console.WriteLine(orgResponse.Organization.City);
-	
+	Console.WriteLine(orgResponse.Organization.Name);
+	Console.WriteLine(orgResponse.Organization.City);
+}
+else if (ipResponse.Network.CustomerRef != null)
+{
+	var customerResponse = await arinClient.QueryResourceAsync(ipResponse.Network.CustomerRef.Handle, 
+								ArinClient.ResourceType.Customer);
+	Console.WriteLine(customerResponse.Organization.Name);
+	Console.WriteLine(customerResponse.Organization.City);
+}
+```
 
 If you don't wanna do async, use `.Result`: 
 
+```csharp
     var response = arinClient.QueryIpAsync(IPAddress.Parse("69.63.176.0")).Result;
-    
+```
+
 But you should do async, really.
 
 
 Limitations
 ===========
 * Read-only
+* Make sure nuget.exe is in your path for building release.
 
 
 
 Contributors
 ============
 * [MaxHorstmann](https://github.com/MaxHorstmann) (Max Horstmann)
+* [KeithJJones] (https://github.com/keithjjones) (Keith J. Jones)
 
+More Reading
+============
+* [ARIN's Documentation on the RESTful Interface] (https://www.arin.net/resources/whoisrws/whois_api.html)
 
 
diff --git a/nuget/ArinWhois.0.1.nupkg b/nuget/ArinWhois.0.1.nupkg
deleted file mode 100644
index b003d3a..0000000
Binary files a/nuget/ArinWhois.0.1.nupkg and /dev/null differ
diff --git a/nuget/ArinWhois.0.2.nupkg b/nuget/ArinWhois.0.2.nupkg
deleted file mode 100644
index ba74688..0000000
Binary files a/nuget/ArinWhois.0.2.nupkg and /dev/null differ
diff --git a/src/ArinWhois.Tests/ApiTests.cs b/src/ArinWhois.Tests/ApiTests.cs
index 3281d1f..736add9 100644
--- a/src/ArinWhois.Tests/ApiTests.cs
+++ b/src/ArinWhois.Tests/ApiTests.cs
@@ -19,31 +19,207 @@ public void TestIpFound()
 
             Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
             Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
-            Assert.IsNotNull(ipResponse.Network.NetBlocks.NetBlock);
-            Assert.IsNotNull(ipResponse.Network.NetBlocks.NetBlock.CidrLength.Value);
-            Assert.IsNotNull(ipResponse.Network.NetBlocks.NetBlock.Description);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
 
             Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
-            Assert.AreEqual(ipResponse.Network.OrgRef.Name, "Facebook, Inc.");
+            Assert.AreEqual("Facebook, Inc.", ipResponse.Network.OrgRef.Name);
 
             var organizationHandle = ipResponse.Network.OrgRef.Handle;
-            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle, ArinClient.ResourceType.Organization).Result;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
 
             Assert.IsNotNull(organizationResponse);
-            Assert.AreEqual(organizationResponse.Organization.City.Value, "Menlo Park");
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Menlo Park", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("CA", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("94025", organizationResponse.Organization.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp2Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("98.155.64.40")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
 
+            Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
+            Assert.AreEqual("Time Warner Cable Internet LLC", ipResponse.Network.OrgRef.Name);
+
+            var organizationHandle = ipResponse.Network.OrgRef.Handle;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
+
+            Assert.IsNotNull(organizationResponse);
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Herndon", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("VA", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("20171", organizationResponse.Organization.PostalCode.Value);
         }
 
         [TestMethod]
-        public void TestIpNotFound()
+        public void TestIp3Found()
         {
             var arinClient = new ArinClient();
-            var response = arinClient.QueryIpAsync(IPAddress.Parse("108.33.73.20")).Result;
-            Assert.IsNull(response);
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("96.21.63.199")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef.Name);
+            Assert.AreEqual("Videotron Ltee", ipResponse.Network.CustomerRef.Name);
+
+            var customerHandle = ipResponse.Network.CustomerRef.Handle;
+            var customerResponse = arinClient.QueryResourceAsync(customerHandle.ToString(), ArinClient.ResourceType.Customer).Result;
+
+            Assert.IsNotNull(customerResponse);
+            Assert.AreEqual("CANADA", customerResponse.Customer.iso3166_1.Name.Value);
+            Assert.AreEqual("Montreal", customerResponse.Customer.City.Value);
+            Assert.AreEqual("QC", customerResponse.Customer.iso3166_2.Value);
+            Assert.AreEqual("H2X 3W4", customerResponse.Customer.PostalCode.Value);
         }
 
+        [TestMethod]
+        public void TestIp4Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("98.176.133.1")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
 
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
 
+            Assert.IsNull(ipResponse.Network.OrgRef);
 
+            Assert.IsNotNull(ipResponse.Network.CustomerRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef.Name);
+            Assert.AreEqual("Cox Communications", ipResponse.Network.CustomerRef.Name);
+
+            var customerHandle = ipResponse.Network.CustomerRef.Handle;
+            var customerResponse = arinClient.QueryResourceAsync(customerHandle.ToString(), ArinClient.ResourceType.Customer).Result;
+
+            Assert.IsNotNull(customerResponse);
+            Assert.AreEqual("UNITED STATES", customerResponse.Customer.iso3166_1.Name.Value);
+            Assert.AreEqual("Atlanta", customerResponse.Customer.City.Value);
+            Assert.AreEqual("GA", customerResponse.Customer.iso3166_2.Value);
+            Assert.AreEqual("30319", customerResponse.Customer.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp5Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("108.234.177.20")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
+            Assert.AreEqual("AT&T Internet Services", ipResponse.Network.OrgRef.Name);
+
+            var organizationHandle = ipResponse.Network.OrgRef.Handle;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
+
+            Assert.IsNotNull(organizationResponse);
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Richardson", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("TX", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("75082", organizationResponse.Organization.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp6Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("174.65.101.118")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef.Name);
+            Assert.AreEqual("Cox Communications", ipResponse.Network.CustomerRef.Name);
+
+            var customerHandle = ipResponse.Network.CustomerRef.Handle;
+            var customerResponse = arinClient.QueryResourceAsync(customerHandle.ToString(), ArinClient.ResourceType.Customer).Result;
+
+            Assert.IsNotNull(customerResponse);
+            Assert.AreEqual("UNITED STATES", customerResponse.Customer.iso3166_1.Name.Value);
+            Assert.AreEqual("Atlanta", customerResponse.Customer.City.Value);
+            Assert.AreEqual("GA", customerResponse.Customer.iso3166_2.Value);
+            Assert.AreEqual("30319", customerResponse.Customer.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp7Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("174.34.144.69")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
+            Assert.AreEqual("Ubiquity Server Solutions Seattle", ipResponse.Network.OrgRef.Name);
+
+            var organizationHandle = ipResponse.Network.OrgRef.Handle;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
+
+            Assert.IsNotNull(organizationResponse);
+            Assert.AreEqual("12101 Tukwila International Blvd", organizationResponse.Organization.StreetAddress.Line[0].Value.Trim());
+            Assert.AreEqual("Suite 100", organizationResponse.Organization.StreetAddress.Line[1].Value.Trim());
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Tukwila", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("WA", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("98168", organizationResponse.Organization.PostalCode.Value);
+        }
     }
 }
diff --git a/src/ArinWhois.Tests/ArinWhois.Tests.csproj b/src/ArinWhois.Tests/ArinWhois.Tests.csproj
index f5a9799..a75b52f 100644
--- a/src/ArinWhois.Tests/ArinWhois.Tests.csproj
+++ b/src/ArinWhois.Tests/ArinWhois.Tests.csproj
@@ -35,7 +35,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Jil, Version=2.12.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Jil.2.12.1\lib\net45\Jil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Sigil, Version=4.5.1.0, Culture=neutral, PublicKeyToken=2d06c3494341c8ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sigil.4.5.1\lib\net45\Sigil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -59,6 +69,10 @@
       <Name>ArinWhois</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/src/ArinWhois.Tests/app.config b/src/ArinWhois.Tests/app.config
new file mode 100644
index 0000000..feb3ba6
--- /dev/null
+++ b/src/ArinWhois.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.1.0" newVersion="4.5.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/ArinWhois.Tests/packages.config b/src/ArinWhois.Tests/packages.config
new file mode 100644
index 0000000..ed0f072
--- /dev/null
+++ b/src/ArinWhois.Tests/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Jil" version="2.12.1" targetFramework="net45" />
+  <package id="Sigil" version="4.5.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/src/ArinWhois.csproj b/src/ArinWhois.csproj
index 929cfa7..bf9f3bc 100644
--- a/src/ArinWhois.csproj
+++ b/src/ArinWhois.csproj
@@ -28,13 +28,16 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\ArinWhois.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Jil">
-      <HintPath>packages\Jil.1.5.0\lib\net45\Jil.dll</HintPath>
+    <Reference Include="Jil, Version=2.12.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Jil.2.12.1\lib\net45\Jil.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Sigil">
-      <HintPath>packages\Sigil.4.2.1\lib\net45\Sigil.dll</HintPath>
+    <Reference Include="Sigil, Version=4.5.1.0, Culture=neutral, PublicKeyToken=2d06c3494341c8ab, processorArchitecture=MSIL">
+      <HintPath>packages\Sigil.4.5.1\lib\net45\Sigil.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -48,16 +51,29 @@
   <ItemGroup>
     <Compile Include="Client\ArinClient.cs" />
     <Compile Include="Model\Common.cs" />
+    <Compile Include="Model\Customer.cs" />
+    <Compile Include="Model\iso3166-1.cs" />
     <Compile Include="Model\Network.cs" />
     <Compile Include="Model\Organization.cs" />
     <Compile Include="Model\PointOfContact.cs" />
+    <Compile Include="Model\StreetAddress.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Model\Response.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>if "$(ConfigurationName)" == "Release" goto PACK
+goto END
+:PACK
+pushd "$(ProjectDir)"
+md "$(SolutionDir)..\nuget"
+nuget.exe pack "$(ProjectFileName)" -Prop Configuration=Release;Platform=AnyCPU -o "$(SolutionDir)..\nuget"
+:END</PostBuildEvent>
+  </PropertyGroup>
   <!-- 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/src/ArinWhois.nuspec b/src/ArinWhois.nuspec
index b2a88f1..f0d101f 100644
--- a/src/ArinWhois.nuspec
+++ b/src/ArinWhois.nuspec
@@ -1,16 +1,26 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>ArinWhois</id>
-    <version>0.2</version>
-    <title>ArinWhois.NET</title>
-    <authors>Max Horstmann</authors>
-    <owners>Max Horstmann</owners>
-    <projectUrl>https://github.com/MaxHorstmann/ArinWhois.NET</projectUrl>
+    <id>ArinWhois-VS2015</id>
+    <version>20160120.1</version>
+    <title>ArinWhois.NET-VS2015</title>
+    <authors>Max Horstmann, Keith J. Jones</authors>
+    <owners>Max Horstmann, Keith J. Jones</owners>
+    <projectUrl>https://github.com/keithjjones/ArinWhois.NET</projectUrl>
+	<licenseUrl>https://github.com/keithjjones/ArinWhois.NET/blob/master/License.md</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>.NET client for ARIN's Whois RESTful Web Service, the API to accessing ARIN's Whois data.</description>
-    <releaseNotes>Pre-Relase version</releaseNotes>
-    <copyright>Copyright Max Horstmann, 2014</copyright>
-    <tags>ARIN</tags>
+    <description>.NET client for ARIN's Whois RESTful Web Service, the API to accessing ARIN's Whois data.  Fork of the ArinWhois.NET project for VS 2015.</description>
+    <releaseNotes>
+		20160120.1	Updated assembly information.
+		20160119.4	Edited assembly information.
+		20160119.3	Enabled IntelliSense XML output.
+		20160119.2	Added more IntelliSense information.
+		20160119.1	Added IntelliSense information.
+		20160118.1	Changed link to license file.
+		20160115.1	Changed the name to be slightly different than the original.
+		20160114.6	Recent Stable Build
+	</releaseNotes>
+    <copyright>Copyright Max Horstmann, 2014; Copyright Keith Jones, 2016</copyright>
+    <tags>ARIN Whois</tags>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/src/ArinWhois.sln b/src/ArinWhois.sln
index 5324757..ac01154 100644
--- a/src/ArinWhois.sln
+++ b/src/ArinWhois.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21126.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArinWhois", "ArinWhois.csproj", "{715FB44F-AE81-406D-9EA3-224F55807E06}"
 EndProject
diff --git a/src/Client/ArinClient.cs b/src/Client/ArinClient.cs
index c0d292f..a852e8e 100644
--- a/src/Client/ArinClient.cs
+++ b/src/Client/ArinClient.cs
@@ -3,23 +3,43 @@
 using System.Threading.Tasks;
 using ArinWhois.Model;
 using Jil;
+using System.Collections.Generic;
+
 
 namespace ArinWhois.Client
 {
+    /// <summary>
+    /// A class for ARIN operations
+    /// </summary>
     public class ArinClient
     {
+        /// <summary>
+        /// The base URL for ARIN whois.
+        /// </summary>
         private const string BaseUrl = "http://whois.arin.net/rest";
 
-        private static readonly Options DeserializationOptions = Options.ISO8601;
+        /// <summary>
+        /// Options for the JSON deserialization process.
+        /// </summary>
+        private static readonly Options DeserializationOptions = Options.ISO8601ExcludeNulls;
 
+        /// <summary>
+        /// The types of resources that can be queried through ARIN.
+        /// </summary>
         public enum ResourceType
         {
             Unknown = 0,
             Network = 1,
             Organization = 2,
-            PointOfContact = 3
+            PointOfContact = 3,
+            Customer = 4
         }
 
+        /// <summary>
+        /// Query an IP address, async
+        /// </summary>
+        /// <param name="ip">The IP address to query.</param>
+        /// <returns>Returns an async task with the response.</returns>
         public async Task<Response> QueryIpAsync(IPAddress ip)
         {
             using (var wc = new WebClient())
@@ -29,7 +49,26 @@ public async Task<Response> QueryIpAsync(IPAddress ip)
                     var query = string.Format("ip/{0}", ip);
                     var url = GetRequestUrl(query);
                     var jsonString = await wc.DownloadStringTaskAsync(url);
+
                     var deser = JSON.Deserialize<Response>(jsonString, DeserializationOptions);
+                    var deserdyn = JSON.DeserializeDynamic(jsonString, DeserializationOptions);
+                    var netblock_ser = deserdyn["net"]["netBlocks"]["netBlock"];
+
+                    try
+                    {
+                        // Take care of non-array
+                        NetBlock netblock = JSON.Deserialize<NetBlock>(JSON.SerializeDynamic(netblock_ser), DeserializationOptions);
+                        deser.Network.NetBlocks.Add(netblock);
+                        return deser;
+                    }
+                    catch
+                    {
+                    }
+
+                    // Take care of array
+                    List<NetBlock> netblocks = JSON.Deserialize<List<NetBlock>>(JSON.SerializeDynamic(netblock_ser), DeserializationOptions);
+                    deser.Network.NetBlocks = netblocks;
+
                     return deser;
                 }
                 catch
@@ -39,33 +78,95 @@ public async Task<Response> QueryIpAsync(IPAddress ip)
             }
         }
 
+        /// <summary>
+        /// Queries a resource record on a handle.
+        /// </summary>
+        /// <param name="handle">The handle to query.</param>
+        /// <param name="resourceType">The type of resource record to query.</param>
+        /// <returns>Returns an async task of the response.</returns>
         public async Task<Response> QueryResourceAsync(string handle, ResourceType resourceType)
         {
-            if (resourceType != ResourceType.Organization) throw new NotImplementedException(); // coming soon
+            if (resourceType != ResourceType.Organization && resourceType != ResourceType.Customer) throw new NotImplementedException(); // coming soon
 
             using (var wc = new WebClient())
             {
-                try
+                switch (resourceType)
                 {
-                    var query = string.Format("org/{0}/pft", handle);
-                    var jsonString = await wc.DownloadStringTaskAsync(GetRequestUrl(query));
-                    var deser = JSON.Deserialize<ResponseOuter>(jsonString, DeserializationOptions);
-                    return deser.ResponseInner;
-                }
-                catch
-                {
-                    return null;
+                    case ResourceType.Organization:
+                        try
+                        {
+                            var query = string.Format("org/{0}", handle);
+                            var jsonString = await wc.DownloadStringTaskAsync(GetRequestUrl(query));
+                            var deser = JSON.Deserialize<Response>(jsonString, DeserializationOptions);
+
+                            var deserdyn = JSON.DeserializeDynamic(jsonString, DeserializationOptions);
+                            var streetaddress_ser = deserdyn["org"]["streetAddress"]["line"];
+
+                            try
+                            {
+                                ValueWrapper<string> streetaddress = JSON.Deserialize<ValueWrapper<string>>(JSON.SerializeDynamic(streetaddress_ser), DeserializationOptions);
+                                deser.Organization.StreetAddress.Line.Add(streetaddress);
+                                return deser;
+                            }
+                            catch
+                            {
+
+                            }
+
+                            List<ValueWrapper<string>> streetaddresses = JSON.Deserialize<List<ValueWrapper<string>>>(JSON.SerializeDynamic(streetaddress_ser), DeserializationOptions);
+                            deser.Organization.StreetAddress.Line = streetaddresses;
+
+                            return deser;
+                        }
+                        catch
+                        {
+                            return null;
+                        }
+
+                    case ResourceType.Customer:
+                        try
+                        {
+                            var query = string.Format("customer/{0}", handle);
+                            var jsonString = await wc.DownloadStringTaskAsync(GetRequestUrl(query));
+                            var deser = JSON.Deserialize<Response>(jsonString, DeserializationOptions);
+
+                            var deserdyn = JSON.DeserializeDynamic(jsonString, DeserializationOptions);
+                            var streetaddress_ser = deserdyn["customer"]["streetAddress"]["line"];
+
+                            try
+                            {
+                                ValueWrapper<string> streetaddress = JSON.Deserialize<ValueWrapper<string>>(JSON.SerializeDynamic(streetaddress_ser), DeserializationOptions);
+                                deser.Customer.StreetAddress.Line.Add(streetaddress);
+                                return deser;
+                            }
+                            catch
+                            {
+
+                            }
+
+                            List<ValueWrapper<string>> streetaddresses = JSON.Deserialize<List<ValueWrapper<string>>>(JSON.SerializeDynamic(streetaddress_ser), DeserializationOptions);
+                            deser.Customer.StreetAddress.Line = streetaddresses;
+
+                            return deser;
+                        }
+                        catch
+                        {
+                            return null;
+                        }
                 }
             }
+            return null;
         }
 
-
+        /// <summary>
+        /// Builds the string for the ARIN request.
+        /// </summary>
+        /// <param name="query">The query to perform.</param>
+        /// <returns>The formatted URL.</returns>
         private static Uri GetRequestUrl(string query)
         {
             return new Uri(string.Format("{0}/{1}.json", BaseUrl, query));
         }
-        
-
 
     }
 
diff --git a/src/Model/Common.cs b/src/Model/Common.cs
index 9e3c32e..3d40499 100644
--- a/src/Model/Common.cs
+++ b/src/Model/Common.cs
@@ -2,6 +2,10 @@
 
 namespace ArinWhois.Model
 {
+    /// <summary>
+    /// Wraps a value of a response from the ARIN Whois server.  The server uses a "$" value for most values.
+    /// </summary>
+    /// <typeparam name="T">The type of value to be wrapped.</typeparam>
     public class ValueWrapper<T>
     {
         [DataMember(Name = "$")]
diff --git a/src/Model/Customer.cs b/src/Model/Customer.cs
new file mode 100644
index 0000000..602ffe9
--- /dev/null
+++ b/src/Model/Customer.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace ArinWhois.Model
+{
+    /// <summary>
+    /// The customer content of an ARIN Whois response.
+    /// </summary>
+    public class Customer
+    {
+        [DataMember(Name = "@termsOfUse")]
+        public string TermsOfUse { get; set; }
+
+        [DataMember(Name = "registrationDate")]
+        public ValueWrapper<DateTime> RegistrationDate { get; set; }
+
+        [DataMember(Name = "name")]
+        public ValueWrapper<string> Name { get; set; }
+
+        [DataMember(Name = "postalCode")]
+        public ValueWrapper<string> PostalCode { get; set; }
+
+        [DataMember(Name = "city")]
+        public ValueWrapper<string> City { get; set; }
+
+        [DataMember(Name = "updateDate")]
+        public ValueWrapper<DateTime> UpdateDate { get; set; }
+
+        [DataMember(Name = "ref")]
+        public ValueWrapper<string> Ref { get; set; }
+
+        [DataMember(Name = "iso3166-1")]
+        public iso3166_1 iso3166_1 { get; set; }
+
+        [DataMember(Name = "iso3166-2")]
+        public ValueWrapper<string> iso3166_2 { get; set; }
+
+        [DataMember(Name = "streetAddress")]
+        public StreetAddress StreetAddress { get; set; }
+    }
+}
diff --git a/src/Model/Network.cs b/src/Model/Network.cs
index dede74e..0bea49d 100644
--- a/src/Model/Network.cs
+++ b/src/Model/Network.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Runtime.Serialization;
+using System.Collections.Generic;
 
 namespace ArinWhois.Model
 {
+    /// <summary>
+    /// The network content of a ARIN whois query.
+    /// </summary>
     public class Network
     {
         [DataMember(Name = "@termsOfUse")]
@@ -32,14 +36,20 @@ public class Network
         [DataMember(Name = "version")]
         public ValueWrapper<string> Version { get; set; }
 
-        [DataMember(Name = "netBlocks")]
-        public NetBlocks NetBlocks { get; set; }
+        //[DataMember(Name = "netBlocks")]
+        public List<NetBlock> NetBlocks = new List<NetBlock>();
 
         [DataMember(Name = "orgRef")]
         public OrgRef OrgRef { get; set; }
 
+        [DataMember(Name = "customerRef")]
+        public OrgRef CustomerRef { get; set; }
+
     }
 
+    /// <summary>
+    /// The organization reference of an ARIN Whois query.
+    /// </summary>
     public class OrgRef
     {
         [DataMember(Name = "@name")]
@@ -49,12 +59,21 @@ public class OrgRef
         public string Handle { get; set; }
     }
 
-    public class NetBlocks
+    /// <summary>
+    /// The customer reference of an ARIN Whois query.
+    /// </summary>
+    public class CustomerRef
     {
-        [DataMember(Name = "netBlock")]
-        public NetBlock NetBlock { get; set; }  // damn it, API sometimes sends an array here
-   }
+        [DataMember(Name = "@name")]
+        public string Name { get; set; }
+
+        [DataMember(Name = "@handle")]
+        public string Handle { get; set; }
+    }
 
+    /// <summary>
+    /// The netblock content of an ARIN Whois query.
+    /// </summary>
     public class NetBlock
     {
         [DataMember(Name = "cidrLength")]
diff --git a/src/Model/Organization.cs b/src/Model/Organization.cs
index 16b6edc..87eb827 100644
--- a/src/Model/Organization.cs
+++ b/src/Model/Organization.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Runtime.Serialization;
+using System.Collections.Generic;
 
 namespace ArinWhois.Model
 {
+    /// <summary>
+    /// The organization content of an ARIN Whois query.
+    /// </summary>
     public class Organization
     {
         [DataMember(Name = "@termsOfUse")]
@@ -22,5 +26,18 @@ public class Organization
 
         [DataMember(Name = "updateDate")]
         public ValueWrapper<DateTime> UpdateDate { get; set; }
+
+        [DataMember(Name = "ref")]
+        public ValueWrapper<string> Ref { get; set; }
+
+        [DataMember(Name = "iso3166-1")]
+        public iso3166_1 iso3166_1 { get; set; }
+
+        [DataMember(Name = "iso3166-2")]
+        public ValueWrapper<string> iso3166_2 { get; set; }
+
+        [DataMember(Name = "streetAddress")]
+        public StreetAddress StreetAddress { get; set; }
+
     }
 }
diff --git a/src/Model/PointOfContact.cs b/src/Model/PointOfContact.cs
index 10af175..be1e8e8 100644
--- a/src/Model/PointOfContact.cs
+++ b/src/Model/PointOfContact.cs
@@ -3,6 +3,9 @@
 
 namespace ArinWhois.Model
 {
+    /// <summary>
+    /// A point of contact content of an ARIN Whois query.  Currently not implemented.
+    /// </summary>
     public class PointOfContact
     {
         [DataMember(Name = "@termsOfUse")]
diff --git a/src/Model/Response.cs b/src/Model/Response.cs
index dfd7443..f9824fb 100644
--- a/src/Model/Response.cs
+++ b/src/Model/Response.cs
@@ -2,12 +2,9 @@
 
 namespace ArinWhois.Model
 {
-    internal class ResponseOuter
-    {
-        [DataMember(Name = "ns4:pft")]
-        public Response ResponseInner { get; set; }
-    }
-
+    /// <summary>
+    /// A response from the ARIN Whois server.
+    /// </summary>
     public class Response
     {
         [DataMember(Name = "net")]
@@ -18,6 +15,8 @@ public class Response
 
         [DataMember(Name = "poc")]
         public PointOfContact PointOfContact { get; set; }
-    }
 
+        [DataMember(Name = "customer")]
+        public Customer Customer { get; set; }
+    }
 }
diff --git a/src/Model/StreetAddress.cs b/src/Model/StreetAddress.cs
new file mode 100644
index 0000000..05243d3
--- /dev/null
+++ b/src/Model/StreetAddress.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ArinWhois.Model
+{
+    /// <summary>
+    /// The street address used by an ARIN response.
+    /// </summary>
+    public class StreetAddress
+    {
+        //[DataMember(Name = "line")]
+        public List<ValueWrapper<string>> Line = new List<ValueWrapper<string>>();
+    }
+}
diff --git a/src/Model/iso3166-1.cs b/src/Model/iso3166-1.cs
new file mode 100644
index 0000000..0d3861f
--- /dev/null
+++ b/src/Model/iso3166-1.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace ArinWhois.Model
+{
+    /// <summary>
+    /// The international location information used by an ARIN response.
+    /// </summary>
+    public class iso3166_1
+    {
+        [DataMember(Name = "name")]
+        public ValueWrapper<string> Name { get; set; }
+    }
+}
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index a76338c..adba600 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ArinWhois")]
+[assembly: AssemblyTitle("ArinWhois.NET")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("pg")]
-[assembly: AssemblyProduct("ArinWhois")]
-[assembly: AssemblyCopyright("Copyright © pg 2014")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ArinWhois.NET")]
+[assembly: AssemblyCopyright("Copyright © 2014 Max Horstmann 2016 Keith J. Jones")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2016.0120.1.0")]
+[assembly: AssemblyFileVersion("2016.0120.1.0")]
diff --git a/src/app.config b/src/app.config
new file mode 100644
index 0000000..feb3ba6
--- /dev/null
+++ b/src/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.1.0" newVersion="4.5.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/packages.config b/src/packages.config
index a7cf5b9..ed0f072 100644
--- a/src/packages.config
+++ b/src/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Jil" version="1.5.0" targetFramework="net45" />
-  <package id="Sigil" version="4.2.1" targetFramework="net45" />
+  <package id="Jil" version="2.12.1" targetFramework="net45" />
+  <package id="Sigil" version="4.5.1" targetFramework="net45" />
 </packages>
\ No newline at end of file