diff --git a/Example/MainWindow.xaml b/Example/MainWindow.xaml
index dcaad10..b9ac762 100644
--- a/Example/MainWindow.xaml
+++ b/Example/MainWindow.xaml
@@ -10,7 +10,7 @@
     xmlns:demo="clr-namespace:TapTrack.Demo"
     mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="Tappy Demo 3.0" Height="650" Width="800" Foreground="{x:Null}" Background="{StaticResource LightBackground}">
+        Title="Tappy Demo 3.1" Height="650" Width="800" Foreground="{x:Null}" Background="{StaticResource LightBackground}">
     <Grid Background="{StaticResource LightBackground}">
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
@@ -382,10 +382,14 @@
                                     <ColumnDefinition Width="1*"/>
                                     <ColumnDefinition Width="1*"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="1" Foreground="White" Text="Activate keyboard wedge mode"/>
+                                <TextBlock Foreground="White" Text="Activate keyboard wedge mode to read NDEF Text" Grid.ColumnSpan="2" Margin="320,0,51.2,0"/>
                                 <ToggleButton Grid.Column="1" HorizontalAlignment="Right" Name="tgbtnLaunchKeyboardFeature" 
 											  Width="50" Height="30" Margin="0,0,20,0" Style="{StaticResource AnimatedSwitch }" 
 											  Checked="tgbtnLaunchKeyboardFeature_Checked" Unchecked="tgbtnLaunchKeyboardFeature_Unchecked"/>
+                                <TextBlock Foreground="White" Text="Activate keyboard wedge mode to read UIDs" Margin="320,45,51.2,-45" Grid.ColumnSpan="2"/>
+                                <ToggleButton Grid.Column="1" HorizontalAlignment="Right" Name="tgbtnLaunchKeyboardFeatureUid" 
+											  Width="50" Height="30" Margin="0,45,20.2,-45" Style="{StaticResource AnimatedSwitch }" 
+											  Checked="tgbtnLaunchKeyboardFeatureUid_Checked" Unchecked="tgbtnLaunchKeyboardFeatureUid_Unchecked"/>
                                 <!--Checked="tgbtnLaunchKeyboardFeature_Checked"-->
                             </Grid>
                         </StackPanel>
@@ -471,7 +475,7 @@
                                     Batch Encode NFC Tags
                                 </TextBlock>
                                 <TextBlock Foreground="White" TextWrapping="Wrap">
-                                    This is used to encode a batch of tags based on an imported file.                                
+                                    This is used to encode a batch of tags based on an imported file.
                                 </TextBlock>
                                 <TextBlock Foreground="White" TextWrapping="Wrap" Margin="0,10,0,10">
                                     The imported file should be a .csv or .txt file, and contain a single column for the URI or text for the NDEF with each entry appearing on a new line as follows:
@@ -601,10 +605,10 @@
                                         <DataGridTextColumn Header="Encoded" Binding="{Binding encodedSuccessfully, Converter={StaticResource intToYesNoConverter}}" Width="500"/>
                                     </DataGrid.Columns>
                                 </DataGrid>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">                                       
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                                     <Button HorizontalAlignment="Right" Style="{StaticResource RoundButton}" Click="ExportImportedBatch">
-                                    Export to spreadsheet
-                                </Button>
+                                        Export to spreadsheet
+                                    </Button>
                                     <Button HorizontalAlignment="Right" Style="{StaticResource RoundButton}" Click="ClearImportedBatch">
                                         Delete Imported Batch
                                     </Button>
@@ -619,7 +623,7 @@
                                     Export a spreadsheet of all tags batch encoded on this station
                             </TextBlock>
                             <StackPanel Margin="10" DockPanel.Dock="Top">
-               
+
                                 <Button HorizontalAlignment="Right" Style="{StaticResource RoundButton}" Click="ExportEncodingEvents">
                                     Export Encoded Tag List
                                 </Button>
diff --git a/Example/MainWindow.xaml.cs b/Example/MainWindow.xaml.cs
index 72b6634..1bc638a 100644
--- a/Example/MainWindow.xaml.cs
+++ b/Example/MainWindow.xaml.cs
@@ -41,6 +41,7 @@ public partial class MainWindow : Window
         bool keyboardModeLineBreak = false;
         bool keyboardModeTab = false;
         bool keyboardModeTabLineBreakLast = false;
+        bool keyboardModeUid = false;
 
         int numTagsEncodedInThisBatch = 0;
         string batchPassword = null;
@@ -897,9 +898,18 @@ private void chbxAddlineBreak_Unchecked(object sender, RoutedEventArgs e)
 
         private void tgbtnLaunchKeyboardFeature_Checked(object sender, RoutedEventArgs e)
         {
+            keyboardModeUid = false;
+            StreamNdef streamNdef = new StreamNdef(0, DetectTagSetting.Type2Type4AandMifare);
+            tappy.SendCommand(streamNdef, InvokeKeyboardFeature);
+           
 
-            StreamNdef stream = new StreamNdef(0, DetectTagSetting.Type2Type4AandMifare);
-            tappy.SendCommand(stream, InvokeKeyboardFeature);
+        }
+
+        private void tgbtnLaunchKeyboardFeatureUid_Checked(object sender, RoutedEventArgs e)
+        {
+            keyboardModeUid = true;
+            StreamUid streamUid = new StreamUid(0, DetectTagSetting.Type2Type4AandMifare);
+            tappy.SendCommand(streamUid, InvokeKeyboardFeature);            
 
         }
 
@@ -918,6 +928,7 @@ private void InvokeKeyboardFeature(ResponseFrame frame, Exception e)
 
                 if (temp.Length > 0)
                 {
+                    if (keyboardModeUid == false) { 
                     Array.Copy(data, 2 + data[1], temp, 0, temp.Length);
 
                     NdefMessage message = NdefMessage.FromByteArray(temp);
@@ -954,6 +965,21 @@ private void InvokeKeyboardFeature(ResponseFrame frame, Exception e)
                     };
 
                     Dispatcher.BeginInvoke(EnterKeystrokes);
+                    }
+                    else //keyboard UID mode
+                    {
+                        Tag tag = new Tag(frame.Data);
+
+                      Action EnterKeystrokesUid = () =>
+                    {
+                        System.Windows.Forms.SendKeys.SendWait(BitConverter.ToString(tag.UID));
+                        if (keyboardModeLineBreak)
+                            System.Windows.Forms.SendKeys.SendWait("{ENTER}");
+                        if (keyboardModeTab)
+                            System.Windows.Forms.SendKeys.SendWait("{TAB}");            
+                    };
+                        Dispatcher.BeginInvoke(EnterKeystrokesUid);
+                    }
                 }
             }
 
@@ -964,6 +990,12 @@ private void tgbtnLaunchKeyboardFeature_Unchecked(object sender, RoutedEventArgs
             tappy.SendCommand<Stop>();
         }
 
+        private void tgbtnLaunchKeyboardFeatureUid_Unchecked(object sender, RoutedEventArgs e)
+        {
+            tappy.SendCommand<Stop>();
+        }
+
+
         void TextBox_KeyPressed(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key.ToString() == "Tab")
diff --git a/Example/Properties/AssemblyInfo.cs b/Example/Properties/AssemblyInfo.cs
index 958cf0c..8df0bad 100644
--- a/Example/Properties/AssemblyInfo.cs
+++ b/Example/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
 [assembly: NeutralResourcesLanguage("en-CA")]
 
diff --git a/Example/Tappy Tcmp Demo.csproj b/Example/Tappy Tcmp Demo.csproj
index d881966..165de99 100644
--- a/Example/Tappy Tcmp Demo.csproj	
+++ b/Example/Tappy Tcmp Demo.csproj	
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TapTrack.Demo</RootNamespace>
-    <AssemblyName>Tappy Demo 3.0</AssemblyName>
+    <AssemblyName>Tappy Demo 3.1</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -49,7 +49,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Tappy Demo 3.0.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Tappy Demo 3.1.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,7 +59,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Tappy Demo 3.0.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\Tappy Demo 3.1.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>DA55EDA3D657C041EF308F9D8CDF1B5A4950F2E4</ManifestCertificateThumbprint>