diff --git a/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj b/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj
index 54f680ee..b08b1a4c 100644
--- a/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj
+++ b/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props')" />
   <Import Project="..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" />
   <PropertyGroup>
@@ -12,10 +12,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.Demo</RootNamespace>
     <AssemblyName>PdfiumViewer.Demo</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +26,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -34,6 +36,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -43,6 +46,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -52,6 +56,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -61,6 +66,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -70,6 +76,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -138,6 +145,7 @@
     <EmbeddedResource Include="SearchForm.resx">
       <DependentUpon>SearchForm.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/PdfiumViewer.Demo/Properties/Resources.Designer.cs b/PdfiumViewer.Demo/Properties/Resources.Designer.cs
index 2187ef2f..33cdd862 100644
--- a/PdfiumViewer.Demo/Properties/Resources.Designer.cs
+++ b/PdfiumViewer.Demo/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace PdfiumViewer.Demo.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/PdfiumViewer.Demo/Properties/Settings.Designer.cs b/PdfiumViewer.Demo/Properties/Settings.Designer.cs
index adaa8167..1c44239d 100644
--- a/PdfiumViewer.Demo/Properties/Settings.Designer.cs
+++ b/PdfiumViewer.Demo/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace PdfiumViewer.Demo.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/PdfiumViewer.Demo/app.config b/PdfiumViewer.Demo/app.config
new file mode 100644
index 00000000..b45f31e8
--- /dev/null
+++ b/PdfiumViewer.Demo/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/PdfiumViewer.Test/PdfiumViewer.Test.csproj b/PdfiumViewer.Test/PdfiumViewer.Test.csproj
index c10d65d8..51d72463 100644
--- a/PdfiumViewer.Test/PdfiumViewer.Test.csproj
+++ b/PdfiumViewer.Test/PdfiumViewer.Test.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.Test</RootNamespace>
     <AssemblyName>PdfiumViewer.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
diff --git a/PdfiumViewer.WPFDemo/App.config b/PdfiumViewer.WPFDemo/App.config
index 8e156463..2d2a12d8 100644
--- a/PdfiumViewer.WPFDemo/App.config
+++ b/PdfiumViewer.WPFDemo/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/PdfiumViewer.WPFDemo/App.xaml.cs b/PdfiumViewer.WPFDemo/App.xaml.cs
index 39b2cc8a..ad88b399 100644
--- a/PdfiumViewer.WPFDemo/App.xaml.cs
+++ b/PdfiumViewer.WPFDemo/App.xaml.cs
@@ -13,5 +13,6 @@ namespace PdfiumViewer.WPFDemo
     /// </summary>
     public partial class App : Application
     {
+
     }
 }
diff --git a/PdfiumViewer.WPFDemo/MainWindow.xaml b/PdfiumViewer.WPFDemo/MainWindow.xaml
index 924b81b1..3b22dc1b 100644
--- a/PdfiumViewer.WPFDemo/MainWindow.xaml
+++ b/PdfiumViewer.WPFDemo/MainWindow.xaml
@@ -16,20 +16,22 @@
             <RowDefinition />
             <RowDefinition Height="30" />
             <RowDefinition Height="30" />
+           
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
 
-        <Label x:Name="labelMemDC" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" />
-
+        
         <Button Click="LoadPDFButton_Click" Content="Load PDF" Grid.ColumnSpan="2"/>
+        <!--
+        <Label x:Name="labelMemDC" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" />
         <Button Click="RenderToMemDCButton_Click" Content="Start Rendering by MemDC" Grid.Row="1" Grid.ColumnSpan="2" />
 
         <Label Content="RenderPage with Memory Device Context" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Background="LightGoldenrodYellow"/>
-
         <Image  x:Name="imageMemDC" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"/>
+        -->
 
         <StackPanel Grid.Row="5" Orientation="Horizontal">
             <TextBox x:Name="searchValueTextBox" Text="Enter value to search"   VerticalAlignment="Center" Width="150"/>
@@ -40,5 +42,8 @@
         <Button Content="Search" Grid.Row="6" Click="DoSearch_Click"/>
 
         <TextBox x:Name="searchResultLabel" Grid.Row="5" Grid.RowSpan="2" Grid.Column="1" />
+        <DockPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" >
+            <WindowsFormsHost x:Name="formshHost"/>
+        </DockPanel>
     </Grid>
 </Window>
diff --git a/PdfiumViewer.WPFDemo/MainWindow.xaml.cs b/PdfiumViewer.WPFDemo/MainWindow.xaml.cs
index 9055c300..ae39b5b6 100644
--- a/PdfiumViewer.WPFDemo/MainWindow.xaml.cs
+++ b/PdfiumViewer.WPFDemo/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,129 +9,157 @@
 
 namespace PdfiumViewer.WPFDemo
 {
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        CancellationTokenSource tokenSource;
-        Process currentProcess = Process.GetCurrentProcess();
-        PdfDocument pdfDoc;
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-        private async void RenderToMemDCButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (pdfDoc == null)
-            {
-                MessageBox.Show("First load the document");
-                return;
-            }
-
-            int width = (int)(this.ActualWidth - 30) / 2;
-            int height = (int)this.ActualHeight - 30;
-
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
-
-            try
-            {
-                for (int i = 1; i < pdfDoc.PageCount; i++)
-                {
-                    imageMemDC.Source =
-                        await
-                            Task.Run<BitmapSource>(
-                                new Func<BitmapSource>(
-                                    () =>
-                                    {
-                                        tokenSource.Token.ThrowIfCancellationRequested();
-
-                                        return RenderPageToMemDC(i, width, height);
-                                    }
-                            ), tokenSource.Token);
-
-                    labelMemDC.Content = String.Format("Renderd Pages: {0}, Memory: {1} MB, Time: {2:0.0} sec",
-                        i,
-                        currentProcess.PrivateMemorySize64 / (1024 * 1024),
-                        sw.Elapsed.TotalSeconds);
-
-                    currentProcess.Refresh();
-
-                    GC.Collect();
-                }
-            }
-            catch (Exception ex)
-            {
-                tokenSource.Cancel();
-                MessageBox.Show(ex.Message);
-            }
-
-            sw.Stop();
-            labelMemDC.Content = String.Format("Rendered {0} Pages within {1:0.0} seconds, Memory: {2} MB",
-                pdfDoc.PageCount,
-                sw.Elapsed.TotalSeconds,
-                currentProcess.PrivateMemorySize64 / (1024 * 1024));
-        }
-
-        private BitmapSource RenderPageToMemDC(int page, int width, int height)
-        {
-            var image = pdfDoc.Render(page, width, height, 96, 96, false);
-            return BitmapHelper.ToBitmapSource(image);
-        }
-
-        private void LoadPDFButton_Click(object sender, RoutedEventArgs e)
-        {
-            using (var dialog = new System.Windows.Forms.OpenFileDialog())
-            {
-                dialog.Filter = "PDF Files (*.pdf)|*.pdf|All Files (*.*)|*.*";
-                dialog.Title = "Open PDF File";
-
-                if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-                {
-                    pdfDoc = PdfDocument.Load(dialog.FileName);
-                }
-            }
-        }
-
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            tokenSource = new CancellationTokenSource();
-        }
-
-        private void Window_Closed(object sender, EventArgs e)
-        {
-            if (tokenSource != null)
-                tokenSource.Cancel();
-
-            if (pdfDoc != null)
-                pdfDoc.Dispose();
-        }
-
-        private void DoSearch_Click(object sender, RoutedEventArgs e)
-        {
-            string text = searchValueTextBox.Text;
-            bool matchCase = matchCaseCheckBox.IsChecked.GetValueOrDefault();
-            bool wholeWordOnly = wholeWordOnlyCheckBox.IsChecked.GetValueOrDefault();
-
-            DoSearch(text, matchCase, wholeWordOnly);
-        }
-
-        private void DoSearch(string text, bool matchCase, bool wholeWord)
-        {
-            var matches = pdfDoc.Search(text, matchCase, wholeWord);
-            var sb = new StringBuilder();
-
-            foreach (var match in matches.Items)
-            {
-                sb.AppendLine(
-                    String.Format(
-                    "Found \"{0}\" in page: {1}", match.Text, match.Page)
-                );
-            }
-
-            searchResultLabel.Text = sb.ToString();
-        }
-
-    }
+	/// <summary>
+	/// Interaction logic for MainWindow.xaml
+	/// </summary>
+	public partial class MainWindow : Window
+	{
+		CancellationTokenSource tokenSource;
+		Process currentProcess = Process.GetCurrentProcess();
+		PdfDocument pdfDoc;
+		private PdfViewer pdfViewer1;
+
+		public MainWindow()
+		{
+			InitializeComponent();
+
+			/*
+			PdfiumResolver.Resolve += (s, e) => e.PdfiumFileName = Path.Combine(
+				Path.GetDirectoryName(typeof(NativeMethods).Assembly.Location),
+				"native",
+				"pdfium",
+				Environment.Is64BitProcess ? "x64" : "x86",
+				"pdfium.dll");
+			*/
+		}
+
+		private void RenderToMemDCButton_Click(object sender, RoutedEventArgs e)
+		{
+			if (pdfDoc == null)
+			{
+				MessageBox.Show("First load the document");
+				return;
+			}
+
+			int width = (int)(this.ActualWidth - 30) / 2;
+			int height = (int)this.ActualHeight - 30;
+
+			Stopwatch sw = new Stopwatch();
+			sw.Start();
+
+			try
+			{
+				for (int i = 1; i < pdfDoc.PageCount; i++)
+				{
+					/*imageMemDC.Source =
+						await
+							Task.Run<BitmapSource>(
+								new Func<BitmapSource>(
+									() =>
+									{
+										tokenSource.Token.ThrowIfCancellationRequested();
+
+										return RenderPageToMemDC(i, width, height);
+									}
+							), tokenSource.Token);
+
+					labelMemDC.Content = String.Format("Renderd Pages: {0}, Memory: {1} MB, Time: {2:0.0} sec",
+						i,
+						currentProcess.PrivateMemorySize64 / (1024 * 1024),
+						sw.Elapsed.TotalSeconds);
+						*/
+					currentProcess.Refresh();
+
+					GC.Collect();
+				}
+			}
+			catch (Exception ex)
+			{
+				tokenSource.Cancel();
+				MessageBox.Show(ex.Message);
+			}
+
+			sw.Stop();
+
+			/*labelMemDC.Content = String.Format("Rendered {0} Pages within {1:0.0} seconds, Memory: {2} MB",
+				pdfDoc.PageCount,
+				sw.Elapsed.TotalSeconds,
+				currentProcess.PrivateMemorySize64 / (1024 * 1024));*/
+		}
+
+		private BitmapSource RenderPageToMemDC(int page, int width, int height)
+		{
+			var image = pdfDoc.Render(page, width, height, 96, 96, false);
+			return BitmapHelper.ToBitmapSource(image);
+		}
+
+		private void LoadPDFButton_Click(object sender, RoutedEventArgs e)
+		{
+			using (var dialog = new System.Windows.Forms.OpenFileDialog())
+			{
+				dialog.Filter = "PDF Files (*.pdf)|*.pdf|All Files (*.*)|*.*";
+				dialog.Title = "Open PDF File";
+
+				if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+				{
+					pdfDoc = PdfDocument.Load(dialog.FileName);
+
+					pdfViewer1.Document?.Dispose();
+					pdfViewer1.Document = pdfDoc;
+
+				}
+			}
+		}
+
+		private void Window_Loaded(object sender, RoutedEventArgs e)
+		{
+			tokenSource = new CancellationTokenSource();
+
+			//var host = new System.Windows.Forms.Integration.WindowsFormsHost();
+
+
+			//host.HorizontalAlignment = HorizontalAlignment.Stretch;
+			//host.VerticalAlignment=VerticalAlignment.Stretch;
+
+			this.pdfViewer1 = new PdfViewer();
+			formshHost.Child = pdfViewer1;
+
+			//this.previewPanel.Children.Add(host);
+		}
+
+		private void Window_Closed(object sender, EventArgs e)
+		{
+			if (tokenSource != null)
+				tokenSource.Cancel();
+
+			if (pdfDoc != null)
+				pdfDoc.Dispose();
+		}
+
+		private void DoSearch_Click(object sender, RoutedEventArgs e)
+		{
+			string text = searchValueTextBox.Text;
+			bool matchCase = matchCaseCheckBox.IsChecked.GetValueOrDefault();
+			bool wholeWordOnly = wholeWordOnlyCheckBox.IsChecked.GetValueOrDefault();
+
+			DoSearch(text, matchCase, wholeWordOnly);
+		}
+
+		private void DoSearch(string text, bool matchCase, bool wholeWord)
+		{
+			var matches = pdfDoc.Search(text, matchCase, wholeWord);
+			var sb = new StringBuilder();
+
+			foreach (var match in matches.Items)
+			{
+				sb.AppendLine(
+					String.Format(
+					"Found \"{0}\" in page: {1}", match.Text, match.Page)
+				);
+			}
+
+			searchResultLabel.Text = sb.ToString();
+		}
+
+	}
 }
diff --git a/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj b/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj
index 614d2b7d..370988da 100644
--- a/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj
+++ b/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.WPFDemo</RootNamespace>
     <AssemblyName>PdfiumViewer.WPFDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -89,6 +91,7 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -135,7 +138,9 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PdfiumViewer\PdfiumViewer.csproj">
diff --git a/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs b/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs
index 0c40e3a1..c5f6d4e9 100644
--- a/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs
+++ b/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs
@@ -1,17 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.36323
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PdfiumViewer.WPFDemo.Properties
-{
-
-
+namespace PdfiumViewer.WPFDemo.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace PdfiumViewer.WPFDemo.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PdfiumViewer.WPFDemo.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs b/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs
index 638c15f4..c4146e62 100644
--- a/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs
+++ b/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.36323
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PdfiumViewer.WPFDemo.Properties
-{
-
-
+namespace PdfiumViewer.WPFDemo.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/PdfiumViewer/NativeMethods.Pdfium.cs b/PdfiumViewer/NativeMethods.Pdfium.cs
index 33c245ae..8f6bcfbf 100644
--- a/PdfiumViewer/NativeMethods.Pdfium.cs
+++ b/PdfiumViewer/NativeMethods.Pdfium.cs
@@ -330,11 +330,11 @@ public static IntPtr FPDFLink_GetDest(IntPtr document, IntPtr link)
             }
         }
 
-        public static uint FPDFDest_GetPageIndex(IntPtr document, IntPtr dest)
+        public static uint FPDFDest_GetDestPageIndex(IntPtr document, IntPtr dest)
         {
             lock (LockString)
             {
-                return Imports.FPDFDest_GetPageIndex(document, dest);
+                return Imports.FPDFDest_GetDestPageIndex(document, dest);
             }
         }
 
@@ -712,7 +712,7 @@ private static class Imports
             public static extern IntPtr FPDFLink_GetDest(IntPtr document, IntPtr link);
 
             [DllImport("pdfium.dll")]
-            public static extern uint FPDFDest_GetPageIndex(IntPtr document, IntPtr dest);
+            public static extern uint FPDFDest_GetDestPageIndex(IntPtr document, IntPtr dest);
 
             [DllImport("pdfium.dll")]
             public static extern bool FPDFLink_GetAnnotRect(IntPtr linkAnnot, FS_RECTF rect);
diff --git a/PdfiumViewer/NativeMethods.cs b/PdfiumViewer/NativeMethods.cs
index e4c5ca1c..d7b55652 100644
--- a/PdfiumViewer/NativeMethods.cs
+++ b/PdfiumViewer/NativeMethods.cs
@@ -32,8 +32,8 @@ private static bool TryLoadNativeLibrary(string path)
             if (path == null)
                 return false;
 
-            path = Path.Combine(path, IntPtr.Size == 4 ? "x86" : "x64");
-            path = Path.Combine(path, "Pdfium.dll");
+			path = Path.Combine(path, Environment.Is64BitProcess ? "x64" : "x86");
+			path = Path.Combine(path, "Pdfium.dll");
 
             return File.Exists(path) && LoadLibrary(path) != IntPtr.Zero;
         }
diff --git a/PdfiumViewer/PdfFile.cs b/PdfiumViewer/PdfFile.cs
index 298e8198..225db378 100644
--- a/PdfiumViewer/PdfFile.cs
+++ b/PdfiumViewer/PdfFile.cs
@@ -91,7 +91,7 @@ public PdfPageLinks GetPageLinks(int pageNumber, Size pageSize)
                     string uri = null;
 
                     if (destination != IntPtr.Zero)
-                        target = (int)NativeMethods.FPDFDest_GetPageIndex(_document, destination);
+                        target = (int)NativeMethods.FPDFDest_GetDestPageIndex(_document, destination);
 
                     var action = NativeMethods.FPDFLink_GetAction(annotation);
                     if (action != IntPtr.Zero)
@@ -227,7 +227,7 @@ private uint GetBookmarkPageIndex(IntPtr bookmark)
         {
             IntPtr dest = NativeMethods.FPDF_BookmarkGetDest(_document, bookmark);
             if (dest != IntPtr.Zero)
-                return NativeMethods.FPDFDest_GetPageIndex(_document, dest);
+                return NativeMethods.FPDFDest_GetDestPageIndex(_document, dest);
 
             return 0;
         }
diff --git a/PdfiumViewer/PdfViewer.cs b/PdfiumViewer/PdfViewer.cs
index 4e7ec82b..a3eb918f 100644
--- a/PdfiumViewer/PdfViewer.cs
+++ b/PdfiumViewer/PdfViewer.cs
@@ -2,245 +2,258 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace PdfiumViewer
 {
-    /// <summary>
-    /// Control to host PDF documents with support for printing.
-    /// </summary>
-    public partial class PdfViewer : UserControl
-    {
-        private IPdfDocument _document;
-        private bool _showBookmarks;
-
-        /// <summary>
-        /// Gets or sets the PDF document.
-        /// </summary>
-        [DefaultValue(null)]
-        public IPdfDocument Document
-        {
-            get { return _document; }
-            set
-            {
-                if (_document != value)
-                {
-                    _document = value;
-
-                    if (_document != null)
-                    {
-                        _renderer.Load(_document);
-                        UpdateBookmarks();
-                    }
-
-                    UpdateEnabled();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get the <see cref="PdfRenderer"/> that renders the PDF document.
-        /// </summary>
-        public PdfRenderer Renderer
-        {
-            get { return _renderer; }
-        }
-
-        /// <summary>
-        /// Gets or sets the default document name used when saving the document.
-        /// </summary>
-        [DefaultValue(null)]
-        public string DefaultDocumentName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default print mode.
-        /// </summary>
-        [DefaultValue(PdfPrintMode.CutMargin)]
-        public PdfPrintMode DefaultPrintMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the way the document should be zoomed initially.
-        /// </summary>
-        [DefaultValue(PdfViewerZoomMode.FitHeight)]
-        public PdfViewerZoomMode ZoomMode
-        {
-            get { return _renderer.ZoomMode; }
-            set { _renderer.ZoomMode = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the toolbar should be shown.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool ShowToolbar
-        {
-            get { return _toolStrip.Visible; }
-            set { _toolStrip.Visible = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the bookmarks panel should be shown.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool ShowBookmarks
-        {
-            get { return _showBookmarks; }
-            set
-            {
-                _showBookmarks = value;
-                UpdateBookmarks();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the pre-selected printer to be used when the print
-        /// dialog shows up.
-        /// </summary>
-        [DefaultValue(null)]
-        public string DefaultPrinter { get; set; }
-
-        /// <summary>
-        /// Occurs when a link in the pdf document is clicked.
-        /// </summary>
-        [Category("Action")]
-        [Description("Occurs when a link in the pdf document is clicked.")]
-        public event LinkClickEventHandler LinkClick;
-
-        /// <summary>
-        /// Called when a link is clicked.
-        /// </summary>
-        /// <param name="e"></param>
-        protected virtual void OnLinkClick(LinkClickEventArgs e)
-        {
-            var handler = LinkClick;
-            if (handler != null)
-                handler(this, e);
-        }
-
-        private void UpdateBookmarks()
-        {
-            bool visible = _showBookmarks && _document != null && _document.Bookmarks.Count > 0;
-
-            _container.Panel1Collapsed = !visible;
-
-            if (visible)
-            {
-                _container.Panel1Collapsed = false;
-
-                _bookmarks.Nodes.Clear();
-                foreach (var bookmark in _document.Bookmarks)
-                    _bookmarks.Nodes.Add(GetBookmarkNode(bookmark));
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the PdfViewer class.
-        /// </summary>
-        public PdfViewer()
-        {
-            DefaultPrintMode = PdfPrintMode.CutMargin;
-
-            InitializeComponent();
-
-            ShowToolbar = true;
-            ShowBookmarks = true;
-
-            UpdateEnabled();
-        }
-
-        private void UpdateEnabled()
-        {
-            _toolStrip.Enabled = _document != null;
-        }
-
-        private void _zoomInButton_Click(object sender, EventArgs e)
-        {
-            _renderer.ZoomIn();
-        }
-
-        private void _zoomOutButton_Click(object sender, EventArgs e)
-        {
-            _renderer.ZoomOut();
-        }
-
-        private void _saveButton_Click(object sender, EventArgs e)
-        {
-            using (var form = new SaveFileDialog())
-            {
-                form.DefaultExt = ".pdf";
-                form.Filter = Properties.Resources.SaveAsFilter;
-                form.RestoreDirectory = true;
-                form.Title = Properties.Resources.SaveAsTitle;
-                form.FileName = DefaultDocumentName;
-
-                if (form.ShowDialog(FindForm()) == DialogResult.OK)
-                {
-                    try
-                    {
-                        _document.Save(form.FileName);
-                    }
-                    catch
-                    {
-                        MessageBox.Show(
-                            FindForm(),
-                            Properties.Resources.SaveAsFailedText,
-                            Properties.Resources.SaveAsFailedTitle,
-                            MessageBoxButtons.OK,
-                            MessageBoxIcon.Error
-                        );
-                    }
-                }
-            }
-        }
-
-        private void _printButton_Click(object sender, EventArgs e)
-        {
-            using (var form = new PrintDialog())
-            using (var document = _document.CreatePrintDocument(DefaultPrintMode))
-            {
-                form.AllowSomePages = true;
-                form.Document = document;
-                form.UseEXDialog = true;
-                form.Document.PrinterSettings.FromPage = 1;
-                form.Document.PrinterSettings.ToPage = _document.PageCount;
-                if (DefaultPrinter != null)
-                    form.Document.PrinterSettings.PrinterName = DefaultPrinter;
-
-                if (form.ShowDialog(FindForm()) == DialogResult.OK)
-                {
-                    try
-                    {
-                        if (form.Document.PrinterSettings.FromPage <= _document.PageCount)
-                            form.Document.Print();
-                    }
-                    catch
-                    {
-                        // Ignore exceptions; the printer dialog should take care of this.
-                    }
-                }
-            }
-        }
-
-        private TreeNode GetBookmarkNode(PdfBookmark bookmark)
-        {
-            TreeNode node = new TreeNode(bookmark.Title);
-            node.Tag = bookmark;
-            if (bookmark.Children != null)
-            {
-                foreach (var child in bookmark.Children)
-                    node.Nodes.Add(GetBookmarkNode(child));
-            }
-            return node;
-        }
-
-        private void _bookmarks_AfterSelect(object sender, TreeViewEventArgs e)
-        {
-            _renderer.Page = ((PdfBookmark)e.Node.Tag).PageIndex;
-        }
-
-        private void _renderer_LinkClick(object sender, LinkClickEventArgs e)
-        {
-            OnLinkClick(e);
-        }
-    }
+	/// <summary>
+	/// Control to host PDF documents with support for printing.
+	/// </summary>
+	public partial class PdfViewer : UserControl
+	{
+		private IPdfDocument _document;
+		private bool _showBookmarks;
+
+		/// <summary>
+		/// Gets or sets whether to submit the print job asynchronously or not
+		/// </summary>
+		[DefaultValue(false)]
+		public bool PrintAsync { get; set; }
+
+		/// <summary>
+		/// Gets or sets the PDF document.
+		/// </summary>
+		[DefaultValue(null)]
+		public IPdfDocument Document
+		{
+			get { return _document; }
+			set
+			{
+				if (_document != value)
+				{
+					_document = value;
+
+					if (_document != null)
+					{
+						_renderer.Load(_document);
+						UpdateBookmarks();
+					}
+
+					UpdateEnabled();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Get the <see cref="PdfRenderer"/> that renders the PDF document.
+		/// </summary>
+		public PdfRenderer Renderer
+		{
+			get { return _renderer; }
+		}
+
+		/// <summary>
+		/// Gets or sets the default document name used when saving the document.
+		/// </summary>
+		[DefaultValue(null)]
+		public string DefaultDocumentName { get; set; }
+
+		/// <summary>
+		/// Gets or sets the default print mode.
+		/// </summary>
+		[DefaultValue(PdfPrintMode.CutMargin)]
+		public PdfPrintMode DefaultPrintMode { get; set; }
+
+		/// <summary>
+		/// Gets or sets the way the document should be zoomed initially.
+		/// </summary>
+		[DefaultValue(PdfViewerZoomMode.FitHeight)]
+		public PdfViewerZoomMode ZoomMode
+		{
+			get { return _renderer.ZoomMode; }
+			set { _renderer.ZoomMode = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets whether the toolbar should be shown.
+		/// </summary>
+		[DefaultValue(true)]
+		public bool ShowToolbar
+		{
+			get { return _toolStrip.Visible; }
+			set { _toolStrip.Visible = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets whether the bookmarks panel should be shown.
+		/// </summary>
+		[DefaultValue(true)]
+		public bool ShowBookmarks
+		{
+			get { return _showBookmarks; }
+			set
+			{
+				_showBookmarks = value;
+				UpdateBookmarks();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the pre-selected printer to be used when the print
+		/// dialog shows up.
+		/// </summary>
+		[DefaultValue(null)]
+		public string DefaultPrinter { get; set; }
+
+		/// <summary>
+		/// Occurs when a link in the pdf document is clicked.
+		/// </summary>
+		[Category("Action")]
+		[Description("Occurs when a link in the pdf document is clicked.")]
+		public event LinkClickEventHandler LinkClick;
+
+		/// <summary>
+		/// Called when a link is clicked.
+		/// </summary>
+		/// <param name="e"></param>
+		protected virtual void OnLinkClick(LinkClickEventArgs e)
+		{
+			var handler = LinkClick;
+			if (handler != null)
+				handler(this, e);
+		}
+
+		private void UpdateBookmarks()
+		{
+			bool visible = _showBookmarks && _document != null && _document.Bookmarks.Count > 0;
+
+			_container.Panel1Collapsed = !visible;
+
+			if (visible)
+			{
+				_container.Panel1Collapsed = false;
+
+				_bookmarks.Nodes.Clear();
+				foreach (var bookmark in _document.Bookmarks)
+					_bookmarks.Nodes.Add(GetBookmarkNode(bookmark));
+			}
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the PdfViewer class.
+		/// </summary>
+		public PdfViewer()
+		{
+			DefaultPrintMode = PdfPrintMode.CutMargin;
+
+			InitializeComponent();
+
+			ShowToolbar = true;
+			ShowBookmarks = true;
+
+			UpdateEnabled();
+		}
+
+		private void UpdateEnabled()
+		{
+			_toolStrip.Enabled = _document != null;
+		}
+
+		private void _zoomInButton_Click(object sender, EventArgs e)
+		{
+			_renderer.ZoomIn();
+		}
+
+		private void _zoomOutButton_Click(object sender, EventArgs e)
+		{
+			_renderer.ZoomOut();
+		}
+
+		private void _saveButton_Click(object sender, EventArgs e)
+		{
+			using (var form = new SaveFileDialog())
+			{
+				form.DefaultExt = ".pdf";
+				form.Filter = Properties.Resources.SaveAsFilter;
+				form.RestoreDirectory = true;
+				form.Title = Properties.Resources.SaveAsTitle;
+				form.FileName = DefaultDocumentName;
+
+				if (form.ShowDialog(FindForm()) == DialogResult.OK)
+				{
+					try
+					{
+						_document.Save(form.FileName);
+					}
+					catch
+					{
+						MessageBox.Show(
+							FindForm(),
+							Properties.Resources.SaveAsFailedText,
+							Properties.Resources.SaveAsFailedTitle,
+							MessageBoxButtons.OK,
+							MessageBoxIcon.Error
+						);
+					}
+				}
+			}
+		}
+
+		private void _printButton_Click(object sender, EventArgs e)
+		{
+			using (var form = new PrintDialog())
+			using (var document = _document.CreatePrintDocument(DefaultPrintMode))
+			{
+				form.AllowSomePages = true;
+				form.Document = document;
+				form.UseEXDialog = true;
+				form.Document.PrinterSettings.FromPage = 1;
+				form.Document.PrinterSettings.ToPage = _document.PageCount;
+				if (DefaultPrinter != null)
+					form.Document.PrinterSettings.PrinterName = DefaultPrinter;
+
+				if (form.ShowDialog(FindForm()) == DialogResult.OK)
+				{
+					try
+					{
+						if (form.Document.PrinterSettings.FromPage <= _document.PageCount)
+						{
+							if (PrintAsync)
+								Task.Run(() => form.Document.Print());
+							else
+								form.Document.Print();
+						}
+					}
+					catch
+					{
+						// Ignore exceptions; the printer dialog should take care of this.
+					}
+				}
+			}
+		}
+
+		private TreeNode GetBookmarkNode(PdfBookmark bookmark)
+		{
+			TreeNode node = new TreeNode(bookmark.Title);
+			node.Tag = bookmark;
+			if (bookmark.Children != null)
+			{
+				foreach (var child in bookmark.Children)
+					node.Nodes.Add(GetBookmarkNode(child));
+			}
+			return node;
+		}
+
+		private void _bookmarks_AfterSelect(object sender, TreeViewEventArgs e)
+		{
+			_renderer.Page = ((PdfBookmark)e.Node.Tag).PageIndex;
+		}
+
+		private void _renderer_LinkClick(object sender, LinkClickEventArgs e)
+		{
+			OnLinkClick(e);
+		}
+	}
 }
diff --git a/PdfiumViewer/PdfiumViewer.csproj b/PdfiumViewer/PdfiumViewer.csproj
index 24c8e9c9..4c8c946c 100644
--- a/PdfiumViewer/PdfiumViewer.csproj
+++ b/PdfiumViewer/PdfiumViewer.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer</RootNamespace>
     <AssemblyName>PdfiumViewer</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -27,6 +28,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -37,6 +39,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/PdfiumViewer/Properties/Resources.Designer.cs b/PdfiumViewer/Properties/Resources.Designer.cs
index 0976cb5f..21049eed 100644
--- a/PdfiumViewer/Properties/Resources.Designer.cs
+++ b/PdfiumViewer/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace PdfiumViewer.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {