diff --git a/.gitignore b/.gitignore
index ce3a150ad..185d75be4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,4 +107,6 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
-*.DotSettings
\ No newline at end of file
+*.DotSettings
+/.vs
+/Source/.vs/HtmlRenderer/DesignTimeBuild
diff --git a/Source/Demo/WinForms/Program.cs b/Source/Demo/WinForms/Program.cs
index f01eb6d0a..40ec76691 100644
--- a/Source/Demo/WinForms/Program.cs
+++ b/Source/Demo/WinForms/Program.cs
@@ -15,6 +15,7 @@
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
+using TheArtOfDev.HtmlRenderer.Core;
 
 namespace TheArtOfDev.HtmlRenderer.Demo.WinForms
 {
@@ -30,6 +31,7 @@ private static void Main()
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+            HtmlContainerInt.ImagesSecurityProtocol = System.Net.SecurityProtocolType.Tls;
             Application.Run(new DemoForm());
 
             // Application.Run(new PerfForm());
diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index ef0fd7acc..ac2cd56cf 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -1,90 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CA249F5D-9285-40A6-B217-5889EF79FD7E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TheArtOfDev.HtmlRenderer.PdfSharp</RootNamespace>
-    <AssemblyName>HtmlRenderer.PdfSharp</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net20</TargetFramework>
+    <Version>1.5.2</Version>
+    <AssemblyTitle>HTML Renderer</AssemblyTitle>
+    <Company>Open source hosted on CodePlex</Company>
+    <Product>HTML Renderer</Product>
+    <Copyright>Copyright ©  2008</Copyright>
+    <PackageVersion>1.5.2-alpha</PackageVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PdfSharp, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PdfSharp.Charting, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
+    <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj" />
+    <PackageReference Include="PdfSharp" Version="1.51.5185-beta" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Adapters\BrushAdapter.cs" />
-    <Compile Include="Adapters\FontAdapter.cs" />
-    <Compile Include="Adapters\FontFamilyAdapter.cs" />
-    <Compile Include="Adapters\GraphicsAdapter.cs" />
-    <Compile Include="Adapters\GraphicsPathAdapter.cs" />
-    <Compile Include="Adapters\ImageAdapter.cs" />
-    <Compile Include="Adapters\PenAdapter.cs" />
-    <Compile Include="Adapters\XTextureBrush.cs" />
-    <Compile Include="PdfGenerateConfig.cs" />
-    <Compile Include="HtmlContainer.cs" />
-    <Compile Include="PdfGenerator.cs" />
-    <Compile Include="Adapters\PdfSharpAdapter.cs" />
-    <Compile Include="Utilities\Utils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj">
-      <Project>{fe611685-391f-4e3e-b27e-d3150e51e49b}</Project>
-      <Name>HtmlRenderer</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Source/HtmlRenderer/Core/Handlers/ImageDownloader.cs b/Source/HtmlRenderer/Core/Handlers/ImageDownloader.cs
index 2f8b0f5e6..310800484 100644
--- a/Source/HtmlRenderer/Core/Handlers/ImageDownloader.cs
+++ b/Source/HtmlRenderer/Core/Handlers/ImageDownloader.cs
@@ -48,9 +48,9 @@ internal sealed class ImageDownloader : IDisposable
         /// </summary>
         private readonly Dictionary<string, List<DownloadFileAsyncCallback>> _imageDownloadCallbacks = new Dictionary<string, List<DownloadFileAsyncCallback>>();
 
-        public ImageDownloader()
+        public ImageDownloader(SecurityProtocolType securityProtocolType)
         {
-            ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
+            ServicePointManager.SecurityProtocol = securityProtocolType;
         }
 
         /// <summary>
diff --git a/Source/HtmlRenderer/Core/HtmlContainerInt.cs b/Source/HtmlRenderer/Core/HtmlContainerInt.cs
index 1d71de9fb..e060357b9 100644
--- a/Source/HtmlRenderer/Core/HtmlContainerInt.cs
+++ b/Source/HtmlRenderer/Core/HtmlContainerInt.cs
@@ -13,6 +13,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net;
 using TheArtOfDev.HtmlRenderer.Adapters;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 using TheArtOfDev.HtmlRenderer.Core.Dom;
@@ -79,6 +80,8 @@ namespace TheArtOfDev.HtmlRenderer.Core
     /// </remarks>
     public sealed class HtmlContainerInt : IDisposable
     {
+        public static SecurityProtocolType ImagesSecurityProtocol { get; set; } = (SecurityProtocolType)3072;
+
         #region Fields and Consts
 
         /// <summary>
@@ -517,7 +520,7 @@ public void SetHtml(string htmlSource, CssData baseCssData = null)
                 if (_root != null)
                 {
                     _selectionHandler = new SelectionHandler(_root);
-                    _imageDownloader = new ImageDownloader();
+                    _imageDownloader = new ImageDownloader(ImagesSecurityProtocol);
                 }
             }
         }
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index 74549b41d..b8abde96f 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -1,129 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FE611685-391F-4E3E-B27E-D3150E51E49B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TheArtOfDev.HtmlRenderer</RootNamespace>
-    <AssemblyName>HtmlRenderer</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net20</TargetFramework>
+    <Version>1.5.2-alpha</Version>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
+    <Reference Include="System.DirectoryServices.Protocols" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Core\Utils\ImageError.png" />
     <EmbeddedResource Include="Core\Utils\ImageLoad.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Core\CssDefaults.cs" />
-    <Compile Include="Core\Dom\CssBox.cs" />
-    <Compile Include="Core\Dom\CssBoxFrame.cs" />
-    <Compile Include="Core\Dom\CssBoxHr.cs" />
-    <Compile Include="Core\Dom\CssBoxImage.cs" />
-    <Compile Include="Core\Dom\CssBoxProperties.cs" />
-    <Compile Include="Core\Dom\CssLayoutEngine.cs" />
-    <Compile Include="Core\Dom\CssLayoutEngineTable.cs" />
-    <Compile Include="Core\Dom\CssLength.cs" />
-    <Compile Include="Core\Dom\CssLineBox.cs" />
-    <Compile Include="Core\Dom\CssRect.cs" />
-    <Compile Include="Core\Dom\CssRectImage.cs" />
-    <Compile Include="Core\Dom\CssRectWord.cs" />
-    <Compile Include="Core\Dom\CssSpacingBox.cs" />
-    <Compile Include="Core\Dom\CssUnit.cs" />
-    <Compile Include="Core\Dom\HoverBoxBlock.cs" />
-    <Compile Include="Core\Dom\HtmlTag.cs" />
-    <Compile Include="Core\Dom\Border.cs" />
-    <Compile Include="Core\Entities\CssBlock.cs" />
-    <Compile Include="Core\Entities\CssBlockSelectorItem.cs" />
-    <Compile Include="Core\Entities\HtmlGenerationStyle.cs" />
-    <Compile Include="Core\Entities\HtmlImageLoadEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlLinkClickedEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlLinkClickedException.cs" />
-    <Compile Include="Core\Entities\HtmlRefreshEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlRenderErrorEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlRenderErrorType.cs" />
-    <Compile Include="Core\Entities\HtmlScrollEventArgs.cs" />
-    <Compile Include="Core\Entities\HtmlStylesheetLoadEventArgs.cs" />
-    <Compile Include="Core\Entities\LinkElementData.cs" />
-    <Compile Include="Core\Handlers\BackgroundImageDrawHandler.cs" />
-    <Compile Include="Core\Handlers\BordersDrawHandler.cs" />
-    <Compile Include="Core\Handlers\ContextMenuHandler.cs" />
-    <Compile Include="Core\Handlers\FontsHandler.cs" />
-    <Compile Include="Core\Handlers\ImageDownloader.cs" />
-    <Compile Include="Core\Handlers\ImageLoadHandler.cs" />
-    <Compile Include="Core\Handlers\SelectionHandler.cs" />
-    <Compile Include="Core\Handlers\StylesheetLoadHandler.cs" />
-    <Compile Include="Core\HtmlRendererUtils.cs" />
-    <Compile Include="Core\Parse\CssParser.cs" />
-    <Compile Include="Core\Parse\CssValueParser.cs" />
-    <Compile Include="Core\Parse\DomParser.cs" />
-    <Compile Include="Core\Parse\HtmlParser.cs" />
-    <Compile Include="Core\Parse\RegexParserUtils.cs" />
-    <Compile Include="Core\Utils\ArgChecker.cs" />
-    <Compile Include="Core\Utils\CommonUtils.cs" />
-    <Compile Include="Core\Utils\CssConstants.cs" />
-    <Compile Include="Core\Utils\CssUtils.cs" />
-    <Compile Include="Core\Utils\DomUtils.cs" />
-    <Compile Include="Core\Utils\HtmlConstants.cs" />
-    <Compile Include="Core\Utils\HtmlUtils.cs" />
-    <Compile Include="Core\Utils\RenderUtils.cs" />
-    <Compile Include="Core\HtmlContainerInt.cs" />
-    <Compile Include="Core\CssData.cs" />
-    <Compile Include="Adapters\Entities\RColor.cs" />
-    <Compile Include="Adapters\Entities\RDashStyle.cs" />
-    <Compile Include="Adapters\Entities\RFontStyle.cs" />
-    <Compile Include="Adapters\Entities\RKeyEvent.cs" />
-    <Compile Include="Adapters\Entities\RMouseEvent.cs" />
-    <Compile Include="Adapters\Entities\RPoint.cs" />
-    <Compile Include="Adapters\Entities\RRect.cs" />
-    <Compile Include="Adapters\Entities\RSize.cs" />
-    <Compile Include="Adapters\RAdapter.cs" />
-    <Compile Include="Adapters\RBrush.cs" />
-    <Compile Include="Adapters\RContextMenu.cs" />
-    <Compile Include="Adapters\RControl.cs" />
-    <Compile Include="Adapters\RFont.cs" />
-    <Compile Include="Adapters\RFontFamily.cs" />
-    <Compile Include="Adapters\RGraphics.cs" />
-    <Compile Include="Adapters\RGraphicsPath.cs" />
-    <Compile Include="Adapters\RImage.cs" />
-    <Compile Include="Adapters\RPen.cs" />
-    <Compile Include="Core\Utils\SubString.cs" />
-  </ItemGroup>
-  <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Source/SharedAssemblyInfo.cs b/Source/SharedAssemblyInfo.cs
index d5336037f..ffd859a9f 100644
--- a/Source/SharedAssemblyInfo.cs
+++ b/Source/SharedAssemblyInfo.cs
@@ -5,7 +5,6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("HTML Renderer")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Open source hosted on CodePlex")]
@@ -26,4 +25,5 @@
 
 // Version information for an assembly consists of the following four values:
 
-[assembly: AssemblyVersion("1.5.1.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
\ No newline at end of file