diff --git a/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj b/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj
index de99595..b0dcb38 100644
--- a/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj
+++ b/src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj
@@ -35,13 +35,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/AngleSharp.Scripting.CSharp.Tests/packages.config b/src/AngleSharp.Scripting.CSharp.Tests/packages.config
index 008281b..50bd0e3 100644
--- a/src/AngleSharp.Scripting.CSharp.Tests/packages.config
+++ b/src/AngleSharp.Scripting.CSharp.Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
-  <package id="NUnit" version="3.4.1" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.9" targetFramework="net45" />
+  <package id="NUnit" version="3.6.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj b/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj
index d8b3dd5..be142ec 100644
--- a/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj
+++ b/src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj
@@ -42,8 +42,8 @@
     <Compile Include="WindowContext.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8.1\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/src/AngleSharp.Scripting.CSharp/packages.config b/src/AngleSharp.Scripting.CSharp/packages.config
index b6f21f0..53299c0 100644
--- a/src/AngleSharp.Scripting.CSharp/packages.config
+++ b/src/AngleSharp.Scripting.CSharp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="AngleSharp" version="0.9.9" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj
index ad07959..63a3280 100644
--- a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj
+++ b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj
@@ -35,13 +35,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -50,15 +50,15 @@
     <Compile Include="GeneratorTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AngleSharp.Scripting.JavaScript.Generator\AngleSharp.Scripting.JavaScript.Generator.csproj">
       <Project>{2bebf4ad-1660-43a6-b452-109716f42fa6}</Project>
       <Name>AngleSharp.Scripting.JavaScript.Generator</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config
index 7476793..50bd0e3 100644
--- a/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config
+++ b/src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
-  <package id="NUnit" version="3.4.1" targetFramework="net46" />
+  <package id="AngleSharp" version="0.9.9" targetFramework="net45" />
+  <package id="NUnit" version="3.6.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj b/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj
index 6fd295f..2e09322 100644
--- a/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj
+++ b/src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj
@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/AngleSharp.Scripting.JavaScript.Generator/packages.config b/src/AngleSharp.Scripting.JavaScript.Generator/packages.config
index 076afb7..474fbe0 100644
--- a/src/AngleSharp.Scripting.JavaScript.Generator/packages.config
+++ b/src/AngleSharp.Scripting.JavaScript.Generator/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.9" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj b/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj
index 29ddced..9f3151d 100644
--- a/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj
+++ b/src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj
@@ -35,17 +35,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Jint, Version=2.9.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
+    <Reference Include="jint, Version=2.10.4.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
+      <HintPath>..\packages\jint.2.10.4\lib\net45\jint.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/packages.config b/src/AngleSharp.Scripting.JavaScript.Tests/packages.config
index ce18064..50bd0e3 100644
--- a/src/AngleSharp.Scripting.JavaScript.Tests/packages.config
+++ b/src/AngleSharp.Scripting.JavaScript.Tests/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
-  <package id="Jint" version="2.9.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="NUnit" version="3.4.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="AngleSharp" version="0.9.9" targetFramework="net45" />
+  <package id="NUnit" version="3.6.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj b/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj
index 1aa0fe8..22b0d5f 100644
--- a/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj
+++ b/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj
@@ -34,12 +34,12 @@
     <DocumentationFile>bin\Release\AngleSharp.Scripting.JavaScript.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8.1\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Jint, Version=2.9.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
+    <Reference Include="jint, Version=2.10.4.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
+      <HintPath>..\packages\jint.2.10.4\lib\portable40-net40+sl5+win8+wp8+wpa81\jint.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs b/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs
index 4c52a19..cc0a903 100644
--- a/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs
+++ b/src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs
@@ -48,9 +48,9 @@ public static Object ToObject(JsValue arg)
             return arg.ToObject();
         }
 
-        static Object Clr(this JsValue? arg)
+        static Object Clr(this JsValue arg)
         {
-            return arg.HasValue ? arg.Value.ToObject() : null;
+            return arg?.ToObject();
         }
     }
 }
diff --git a/src/AngleSharp.Scripting.JavaScript/packages.config b/src/AngleSharp.Scripting.JavaScript/packages.config
index e3e3be2..ac63eed 100644
--- a/src/AngleSharp.Scripting.JavaScript/packages.config
+++ b/src/AngleSharp.Scripting.JavaScript/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Jint" version="2.9.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="AngleSharp" version="0.9.9" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="jint" version="2.10.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
\ No newline at end of file