diff --git a/README.md b/README.md
index b051223..cf28289 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,15 @@
-# ![Alt text](nuget/fingerprint48.png "WinBiometric.Net") WinBiometric.Net
+# ![Alt text](nuget/fingerprint48.png "WinBiometric.Net") WinBiometric.Net [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]()
 
 Windows Biometric Framework .NET wrapper
 
-[![NuGet version](https://badge.fury.io/nu/WinBiometricDotNet.svg)](https://badge.fury.io/nu/WinBiometricDotNet)
-[![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]()
-[![API Cover Progress](https://img.shields.io/badge/API%20Coverage-100.0%25%20(52/52)-green.svg)]()
+|Package|NuGet|
+|---|---|
+|WinBiometricDotNet|[![NuGet version](https://img.shields.io/nuget/v/WinBiometricDotNet.svg)](https://www.nuget.org/packages/WinBiometricDotNet)|
 
 ## Support API
 
+[![API Cover Progress](https://img.shields.io/badge/API%20Coverage-100.0%25%20(52/52)-green.svg)]()
+
 |Function|Support|Win 7|Win 8|Win 10|Note|
 |----|:----:|:----:|:----:|:----:|----|
 |WinBioAcquireFocus|✓|✓|✓|✓||
diff --git a/examples/FrameworkTester/ViewModels/WinBioAsyncOpenSessionViewModel.cs b/examples/FrameworkTester/ViewModels/WinBioAsyncOpenSessionViewModel.cs
index 69afbb1..8f89c13 100644
--- a/examples/FrameworkTester/ViewModels/WinBioAsyncOpenSessionViewModel.cs
+++ b/examples/FrameworkTester/ViewModels/WinBioAsyncOpenSessionViewModel.cs
@@ -67,7 +67,6 @@ public override RelayCommand ExecuteCommand
                         this.SessionHandle = 0;
                         this.UpdateUIImmediately();
 
-                        var session = this.HandleRepository.SelectedHandle.Session;
                         switch (this.SelectedMethod)
                         {
                             case AsyncNotificationMethod.NotifyCallback:
@@ -94,12 +93,6 @@ public override RelayCommand ExecuteCommand
 
                         this.WaitCallback = true;
                         this.Result = "OK";
-
-                        if (this.EnableWait)
-                        {
-                            name = "WinBioWait";
-                            this.BiometricService.Wait(session);
-                        }
                     }
                     catch (Exception e)
                     {
diff --git a/sources/WinBiometricDotNet/WinBiometric.cs b/sources/WinBiometricDotNet/WinBiometric.cs
index a0c33f2..7c26b70 100644
--- a/sources/WinBiometricDotNet/WinBiometric.cs
+++ b/sources/WinBiometricDotNet/WinBiometric.cs
@@ -2161,7 +2161,7 @@ private static void ThrowWinBiometricException(int hresult)
             if (!SafeNativeMethods.Macros.FAILED(hresult))
                 return;
 
-            throw Marshal.GetExceptionForHR(hresult);
+            throw Runtime.InteropServices.Marshal.GetWinBiometricExceptionFromHR(hresult);
         }
 
         private static int UnregisterDatabase(Guid databaseId)