diff --git a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Manifest.cs b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Manifest.cs
index faa577f..0c4978d 100644
--- a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Manifest.cs
+++ b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Manifest.cs
@@ -59,6 +59,12 @@ public Manifest(string data)
 		/// <value>The base URI.</value>
 		public string BaseUri { get; private set; }
 
+		/// <summary>
+		/// Gets the base URI.
+		/// </summary>
+		/// <value>The base URI.</value>
+		public string VersionInfoText { get; private set; }
+
 		/// <summary>
 		/// Gets the payload.
 		/// </summary>
@@ -102,6 +108,7 @@ private void Load(string data)
 				RemoteConfigUri = xml.Root.Element("RemoteConfigUri").Value;
 				BaseUri = xml.Root.Element("BaseUri").Value;
 				Payloads = xml.Root.Elements("Payload").Select(x => x.Value).ToArray();
+				VersionInfoText = xml.Root.Element("VersionInfoText").Value;
 			}
 			catch (Exception ex)
 			{
diff --git a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
index dbf3cb1..aa90b38 100644
--- a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
+++ b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
@@ -48,6 +48,7 @@ public class Updater
 
         public bool AllowUpdate { get; set; }
         public bool IsUserNotified { get; set; }
+        public string UpdateInfoText { get; private set; }
 
         #endregion
 
@@ -226,6 +227,7 @@ private void Check(object state)
                 if (!AllowUpdate && !IsUserNotified)
                 {
                     IsUserNotified = true;
+                    UpdateInfoText = this._remoteConfig.VersionInfoText;
                     NewVersionAvailable(this, null);
                     return;
                 }
diff --git a/RFiDGear/App.xaml b/RFiDGear/App.xaml
index 85ebc4f..18410eb 100644
--- a/RFiDGear/App.xaml
+++ b/RFiDGear/App.xaml
@@ -27,6 +27,7 @@
             <mainview:MifareDesfireSetupView x:Key="{x:Type vm:MifareDesfireSetupViewModel}" x:Shared="False" />
             <mainview:MifareUltralightSetupView x:Key="{x:Type vm:MifareUltralightSetupViewModel}" x:Shared="False" />
             <mainview:SetupView x:Key="{x:Type vm:SetupViewModel}" x:Shared="False" />
+            <mainview:UpdateNotifierView x:Key="{x:Type vm:UpdateNotifierViewModel}" x:Shared="False" />
 
             <pre:MessageBoxPresenter x:Key="{x:Type dialogsvm:MessageBoxViewModel}" />
             <pre:OpenFileDialogPresenter x:Key="{x:Type dialogsvm:OpenFileDialogViewModel}" />
diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs
index 9992ec1..c70c642 100644
--- a/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs
+++ b/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs
@@ -23,6 +23,7 @@ public class SettingsReaderWriter : IDisposable
         private readonly int _updateInterval = 900;
         private readonly string _securityToken = "D68EF3A7-E787-4CC4-B020-878BA649B4CD";
         private readonly string _payload = "update.zip";
+        private readonly string _infoText = "Version Info\n\ngoes here! \n==>";
         private readonly string _baseUri = @"https://github.com/c3rebro/RFiDGear/releases/latest/download/";
 
         private readonly Version Version = Assembly.GetExecutingAssembly().GetName().Version;
@@ -85,18 +86,21 @@ public SettingsReaderWriter()
                     XmlElement SecurityTokenElem = doc.CreateElement("SecurityToken");
                     XmlElement BaseUriElem = doc.CreateElement("BaseUri");
                     XmlElement PayLoadElem = doc.CreateElement("Payload");
+                    XmlElement InfoTextElem = doc.CreateElement("VersionInfoText");
 
                     doc.DocumentElement.AppendChild(CheckIntervalElem);
                     doc.DocumentElement.AppendChild(RemoteConfigUriElem);
                     doc.DocumentElement.AppendChild(SecurityTokenElem);
                     doc.DocumentElement.AppendChild(BaseUriElem);
                     doc.DocumentElement.AppendChild(PayLoadElem);
+                    doc.DocumentElement.AppendChild(InfoTextElem);
 
                     CheckIntervalElem.InnerText = _updateInterval.ToString();
                     RemoteConfigUriElem.InnerText = _updateURL;
                     SecurityTokenElem.InnerText = _securityToken;
                     BaseUriElem.InnerText = _baseUri;
                     PayLoadElem.InnerText = _payload;
+                    InfoTextElem.InnerText = _infoText;
 
                     doc.Save(Path.Combine(appDataPath, _updateConfigFileFileName));
                 }
diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
index b516442..014ba42 100644
--- a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
+++ b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
@@ -725,15 +725,15 @@ public ERROR WriteMiFareClassicWithMAD(int _madApplicationID, int _madStartSecto
 							mlocation.MADApplicationID = (ushort)_madApplicationID;
 							mlocation.UseMAD = _useMADToAuth;
 							mlocation.Sector = _madStartSector;
-							
-							MifareAccessInfo aiToWrite = new MifareAccessInfoClass();
+
+                            MifareAccessInfo aiToWrite = new MifareAccessInfoClass();
 							aiToWrite.UseMAD = _keyToWriteUseMAD;
 							aiToWrite.MADKeyA.Value = _madAKeyToUse == _madAKeyToWrite ? madAKeyToUse.Value : madAKeyToWrite.Value; // only set new madkey if mad key has changed
 							aiToWrite.MADKeyB.Value = _madBKeyToUse == _madBKeyToWrite ? madBKeyToUse.Value : madBKeyToWrite.Value; // only set new madkey if mad key has changed
 							aiToWrite.KeyA.Value = _aKeyToUse == _aKeyToWrite ? mAKeyToUse.Value : mAKeyToWrite.Value;
 							aiToWrite.KeyB.Value = _bKeyToUse == _bKeyToWrite ? mBKeyToUse.Value : mBKeyToWrite.Value;
 							aiToWrite.MADGPB = _madGPB;
-							
+
 							var aiToUse = new MifareAccessInfoClass();
 							aiToUse.UseMAD = _useMADToAuth;
 							aiToUse.KeyA = mAKeyToUse;
diff --git a/RFiDGear/RFiDGear.csproj b/RFiDGear/RFiDGear.csproj
index c03644e..1173b3f 100644
--- a/RFiDGear/RFiDGear.csproj
+++ b/RFiDGear/RFiDGear.csproj
@@ -200,6 +200,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\WPFAssemblyInfo.cs" />
     <Compile Include="ViewModel\MainWindowViewModel.cs" />
+    <Compile Include="ViewModel\UpdateNotifierViewModel.cs" />
     <Compile Include="ViewModel\SplashScreenViewModel.cs" />
     <Compile Include="ViewModel\TaskSetupViewModels\GenericChipTaskViewModel.cs" />
     <Compile Include="ViewModel\TaskSetupViewModels\CommonTaskViewModel.cs" />
@@ -214,6 +215,9 @@
     <Compile Include="View\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\UpdateNotifierView.xaml.cs">
+      <DependentUpon>UpdateNotifierView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Splash.xaml.cs">
       <DependentUpon>Splash.xaml</DependentUpon>
     </Compile>
@@ -306,6 +310,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\UpdateNotifierView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Splash.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/RFiDGear/View/Splash.xaml b/RFiDGear/View/Splash.xaml
index 9ca8bcf..ef22bfb 100644
--- a/RFiDGear/View/Splash.xaml
+++ b/RFiDGear/View/Splash.xaml
@@ -3,8 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:RFiDGear.View"
     xmlns:gif="http://wpfanimatedgif.codeplex.com"
+    xmlns:local="clr-namespace:RFiDGear.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="600"
     Height="600"
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
index 04d8629..d5abd8f 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicDataExplorerView.xaml
@@ -231,8 +231,8 @@
                                             BindableSelectionStart="{Binding SelectedDataIndexStart, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
                                             BorderThickness="0"
                                             FontFamily="Lucida Console"
-                                            IsFocused="{Binding IsFocused}"
                                             Text="{Binding DataAsHexString, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
+                                            <!--  IsFocused="{Binding IsFocused}"  -->
                                             <_3rdP:SelectionBindingTextBox.Style>
                                                 <Style TargetType="{x:Type TextBox}">
                                                     <Setter Property="TextWrapping" Value="Wrap" />
diff --git a/RFiDGear/View/UpdateNotifierView.xaml b/RFiDGear/View/UpdateNotifierView.xaml
new file mode 100644
index 0000000..b46b28f
--- /dev/null
+++ b/RFiDGear/View/UpdateNotifierView.xaml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+    x:Class="RFiDGear.View.UpdateNotifierView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dal="clr-namespace:RFiDGear.DataAccessLayer"
+    xmlns:local="clr-namespace:RFiDGear.View"
+    xmlns:v="clr-namespace:RFiDGear.View"
+    Title="{Binding Caption}"
+    Width="500"
+    Height="600"
+    WindowStartupLocation="CenterScreen">
+    <Window.Resources>
+        <dal:ResourceLoader x:Key="Localization"/>
+    </Window.Resources>
+    <Grid Margin="0,0,0,0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="42" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="250" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <GroupBox
+            x:Name="groupBox"
+            Grid.ColumnSpan="3"
+            Margin="10,10,10,10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            Header="GroupBox">
+            <TextBox 
+                HorizontalAlignment="Stretch" 
+                VerticalAlignment="Stretch" 
+                Margin="10,10,10,10" 
+                TextWrapping="Wrap" 
+                IsReadOnly="True" 
+                AcceptsReturn="True" 
+                AcceptsTab="True"
+                Text="{Binding UpdateHistoryText, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
+        </GroupBox>
+        <Button Grid.Column="1" 
+                HorizontalAlignment="Left" 
+                VerticalAlignment="Top"
+                Margin="10,10,0,0" 
+                Grid.Row="1" 
+                Width="95"
+                Command="{Binding ApplyAndExitCommand}"
+                Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='buttonSaveAndExitReaderSetupText'}" />
+        <Button Grid.Column="1" 
+                HorizontalAlignment="Right" 
+                Margin="0,10,10,0" 
+                Grid.Row="1" 
+                VerticalAlignment="Top" 
+                Width="95"
+                Command="{Binding ApplyAndExitCommand}"
+                Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='buttonSaveAndExitReaderSetupText'}" 
+                />
+    </Grid>
+</Window>
diff --git a/RFiDGear/View/UpdateNotifierView.xaml.cs b/RFiDGear/View/UpdateNotifierView.xaml.cs
new file mode 100644
index 0000000..6c01d60
--- /dev/null
+++ b/RFiDGear/View/UpdateNotifierView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace RFiDGear.View
+{
+    /// <summary>
+    /// Interaktionslogik für Splash.xaml
+    /// </summary>
+    public partial class UpdateNotifierView : Window
+    {
+        public UpdateNotifierView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
index 26f56f8..23240c6 100644
--- a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
+++ b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
@@ -41,19 +41,6 @@ public RFiDChipChildLayerViewModel()
 			children = new ObservableCollection<RFiDChipGrandChildLayerViewModel>();
 		}
 
-//		public RFiDChipChildLayerViewModel(
-//			MifareClassicSectorModel _sectorModel,
-//			MifareClassicSetupViewModel _setupViewModel)
-//		{
-//			sectorModel = _sectorModel;
-//			setupViewModel = _setupViewModel;
-//
-//			isTask = true;
-//			children = new ObservableCollection<RFiDChipGrandChildLayerViewModel>();
-//
-//			LoadChildren();
-//		}
-
 		public RFiDChipChildLayerViewModel(
 			MifareClassicSectorModel _sectorModel,
 			RFiDChipParentLayerViewModel parent,
diff --git a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs
index 63870dc..9ddd0b6 100644
--- a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs
+++ b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipGrandChildLayerViewModel.cs
@@ -492,9 +492,11 @@ public int SelectedDataIndexStart
 			set
 			{
 				selectedDataIndexStart = value;
+				
 				if (value % 2 == 0)
 				{
 					SelectedDataIndexStartInBytes = value/2;
+					SelectedDataLengthInBytes = DataAsHexString.Length/2 - value/2;
 					IsValidSelectedDataIndexAndLength = true;
 				}
 				else
diff --git a/RFiDGear/ViewModel/MainWindowViewModel.cs b/RFiDGear/ViewModel/MainWindowViewModel.cs
index efacb92..3bd0311 100644
--- a/RFiDGear/ViewModel/MainWindowViewModel.cs
+++ b/RFiDGear/ViewModel/MainWindowViewModel.cs
@@ -49,6 +49,7 @@ public class MainWindowViewModel : ViewModelBase
         // set if task was completed; indicates greenlight to continue execution
         //if programming takes too long; quit the process
         private bool firstRun = true;
+        private bool updateAvailable = false;
         private protected Mutex mutex;
         //one reader, one instance - only
 
@@ -158,7 +159,7 @@ public MainWindowViewModel()
 
             Application.Current.MainWindow.Closing += new CancelEventHandler(CloseThreads);
             Application.Current.MainWindow.Activated += new EventHandler(LoadCompleted);
-            updater.NewVersionAvailable += new EventHandler(AskForUpdateNow);
+            updater.NewVersionAvailable += new EventHandler(EnableUpdate);
 
             //reminder: any dialog boxes added in the constructor won't appear until DialogBehavior.DialogViewModels gets bound to the Dialogs collection.
         }
@@ -3295,8 +3296,14 @@ public bool RadioButtonEnglishLanguageSelectedState
 
         #region Extensions
 
+        private void EnableUpdate(object sender, EventArgs e)
+        {
+            updateAvailable = true;
+        }
+
         private void AskForUpdateNow(object sender, EventArgs e)
         {
+            /*
             if (new MessageBoxViewModel
             {
                 Caption = ResourceLoader.getResource("messageBoxUpdateAvailableCaption"),
@@ -3309,6 +3316,30 @@ private void AskForUpdateNow(object sender, EventArgs e)
             {
                 (sender as Updater).AllowUpdate = false;
             }
+            */
+
+            updateAvailable = false;
+
+            this.Dialogs.Add(new UpdateNotifierViewModel(updater.UpdateInfoText)
+            {
+
+                Caption = "Update Available",
+
+                OnOk = (updateAction) => 
+                {
+                    (sender as Updater).Update();
+                    updateAction.Close();
+                },
+
+                OnCancel = (updateAction) =>
+                {
+                    (sender as Updater).AllowUpdate = false;
+                    updateAction.Close();
+                }
+            });
+
+
+
 
         }
 
@@ -3334,11 +3365,14 @@ private void LoadCompleted(object sender, EventArgs e)
             mw = (MainWindow)Application.Current.MainWindow;
             mw.Title = string.Format("RFiDGear {0}.{1}.{2} {3}", Version.Major, Version.Minor, Version.Build, Constants.TITLE_SUFFIX);
 
+            if (updateAvailable)
+                AskForUpdateNow(null, null);
+
             Task thread = new Task(() =>
             {
                 while (true)
                 {
-                    for(int i = 0; i<=10; i++)
+                    for (int i = 0; i<=10; i++)
                     {
                         Thread.Sleep(500);
                         ReaderStatus = string.Format("{0}", DateTime.Now);
@@ -3372,6 +3406,7 @@ private void LoadCompleted(object sender, EventArgs e)
             {
             });
 
+            
             thread.Start();
 
             if (firstRun)
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
index 614c28a..f51fa55 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
@@ -1257,7 +1257,6 @@ public string SelectedMADVersion
 
                 RaisePropertyChanged("SelectedMADVersion");
             }
-
         }
         private string selectedMADVersion;
         private byte selectedMADVersionAsByte;
diff --git a/RFiDGear/ViewModel/UpdateNotifierViewModel.cs b/RFiDGear/ViewModel/UpdateNotifierViewModel.cs
new file mode 100644
index 0000000..a7cd549
--- /dev/null
+++ b/RFiDGear/ViewModel/UpdateNotifierViewModel.cs
@@ -0,0 +1,100 @@
+/*
+ * Created by SharpDevelop.
+ * Date: 10/10/2017
+ * Time: 20:31
+ *
+ */
+
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using MvvmDialogs.ViewModels;
+using System;
+using System.Collections.Generic;
+
+namespace RFiDGear.ViewModel
+{
+    /// <summary>
+    /// Description of SetupDialogBoxViewModel.
+    /// </summary>
+    public class UpdateNotifierViewModel : ViewModelBase, IUserDialogViewModel
+    {
+        public UpdateNotifierViewModel()
+        {
+        }
+
+        public UpdateNotifierViewModel(string _text)
+        {
+            UpdateHistoryText = _text;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UpdateHistoryText
+        {
+            get
+            {
+                return updateHistoryText;
+            }
+            set
+            {
+                updateHistoryText = value;
+                RaisePropertyChanged("UpdateHistoryText");
+            }
+        }
+        private string updateHistoryText;
+
+        #region IUserDialogViewModel Implementation
+
+        public Action<UpdateNotifierViewModel> OnOk { get; set; }
+        public Action<UpdateNotifierViewModel> OnCancel { get; set; }
+        public Action<UpdateNotifierViewModel> OnConnect { get; set; }
+        public Action<UpdateNotifierViewModel> OnCloseRequest { get; set; }
+
+        public bool IsModal { get; private set; }
+
+        public virtual void RequestClose()
+        {
+            if (this.OnCloseRequest != null)
+                this.OnCloseRequest(this);
+            else
+                Close();
+        }
+
+        public event EventHandler DialogClosing;
+
+        public void Close()
+        {
+            if (this.DialogClosing != null)
+                this.DialogClosing(this, new EventArgs());
+        }
+
+        public void Show(IList<IDialogViewModel> collection)
+        {
+            collection.Add(this);
+        }
+
+        #endregion IUserDialogViewModel Implementation
+
+        #region Localization
+
+        /// <summary>
+        /// Act as a proxy between RessourceLoader and View directly.
+        /// </summary>
+        public string LocalizationResourceSet { get; set; }
+
+        private string _Caption;
+
+        public string Caption
+        {
+            get { return _Caption; }
+            set
+            {
+                _Caption = value;
+                RaisePropertyChanged(() => this.Caption);
+            }
+        }
+
+        #endregion Localization
+    }
+}
\ No newline at end of file