From 15f9b5ebdc6a4f22a8bc44ee52e4b721c94c8c60 Mon Sep 17 00:00:00 2001
From: heartacker <heartacker@outlook.com>
Date: Sat, 25 Mar 2023 11:34:18 +0800
Subject: [PATCH 1/2] add IsUpdateValueWhenLostFocus to ui

---
 .../UpDownDemoLib/Views/ByteUpDownDemo.xaml   | 487 +++++------
 .../Views/DecimalUpDownDemo.xaml              | 472 +++++------
 .../UpDownDemoLib/Views/DoubleUpDownDemo.xaml | 466 +++++------
 .../UpDownDemoLib/Views/FloatUpDownDemo.xaml  | 472 +++++------
 .../UpDownDemoLib/Views/LongUpDownDemo.xaml   | 462 ++++++-----
 .../Views/NumericUpDownDemo.xaml              | 490 +++++------
 .../Views/PercentageUpDownDemo.xaml           | 768 +++++++++---------
 .../UpDownDemoLib/Views/SByteUpDownDemo.xaml  | 486 +++++------
 .../UpDownDemoLib/Views/ShortUpDownDemo.xaml  | 486 +++++------
 .../Views/UIntegerUpDownDemo.xaml             | 488 +++++------
 .../UpDownDemoLib/Views/ULongUpDownDemo.xaml  | 486 +++++------
 .../UpDownDemoLib/Views/UShortUpDownDemo.xaml | 486 +++++------
 12 files changed, 3109 insertions(+), 2940 deletions(-)

diff --git a/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
index 457d027..dc76ece 100644
--- a/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
@@ -1,264 +1,279 @@
-<UserControl
-	x:Class="UpDownDemoLib.Views.ByteUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+<UserControl
+    x:Class="UpDownDemoLib.Views.ByteUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:ByteUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <cntrl:ByteUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="-2147483647"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="-2147483647"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="512"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="Toggles between normal base 10 display and base 16 (Hex) display." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="Toggles between normal base 10 display and base 16 (Hex) display." />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{DynamicResource PopUpBackground}"
-								BorderBrush="{DynamicResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:ByteUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:ByteUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
 
                     <Border
                         Margin="0,3"
@@ -273,8 +288,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
index 54db41f..df8c4cf 100644
--- a/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
@@ -1,256 +1,270 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.DecimalUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.DecimalUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:DecimalUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="10"
+        <cntrl:DecimalUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="10"
             FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="1024"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="1024"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="2147483647"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="2147483647"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="2147483647"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="2147483647"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:DecimalUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:DecimalUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
 
                     <Border
                         Margin="0,3"
@@ -265,8 +279,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml
index 4ce41bf..6eb3c2b 100644
--- a/source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml
@@ -1,253 +1,267 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.DoubleUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.DoubleUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:DoubleUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="7"
+        <cntrl:DoubleUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="7"
             FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="1024"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="1024"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="2147483647"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="2147483647"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="2147483647"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="2147483647"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border>
-								<StackPanel Margin="3">
-									<cntrl:DoubleUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border>
+                                <StackPanel Margin="3">
+                                    <cntrl:DoubleUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -261,8 +275,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
index 3a463a8..41c0195 100644
--- a/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
@@ -1,256 +1,270 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.FloatUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.FloatUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:FloatUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
+        <cntrl:FloatUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
             FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="1024"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="1024"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="2147483647"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="2147483647"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="2147483647"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="2147483647"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:FloatUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:FloatUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -264,8 +278,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
index 54a39f0..5f30942 100644
--- a/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
@@ -1,239 +1,253 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.LongUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.LongUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:LongUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
+        <cntrl:LongUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
             VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="1024"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="1024"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="-2147483647"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="-2147483647"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="2147483647"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="2147483647"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:LongUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:LongUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
                     <Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
                         <StackPanel xmlns:input="System.Windows.Input" Margin="3">
                             <StackPanel.Resources>
                                 <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
@@ -243,19 +257,19 @@
                             <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
                             <RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
                             <RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
                             <RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
                         </StackPanel>
                     </Border>
                     <Border
@@ -271,8 +285,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
index 22d6115..430cdfc 100644
--- a/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
@@ -1,263 +1,277 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.NumericUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.NumericUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:NumericUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-			IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <cntrl:NumericUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="1024"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="1024"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="-2147483647"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="-2147483647"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="2147483647"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="2147483647"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:NumericUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:NumericUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
 
                     <Border
                         Margin="0,3"
@@ -265,16 +279,16 @@
                         BorderThickness="1">
                         <StackPanel Margin="3">
 
-							<Label Content="FormatString" />
+                            <Label Content="FormatString" />
                             <TextBox Text="{Binding FormatString}" />
 
                         </StackPanel>
 
                     </Border>
 
-                        </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+                </StackPanel>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/PercentageUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/PercentageUpDownDemo.xaml
index 6ddb58a..1971bd3 100644
--- a/source/Demo/UpDownDemoLib/Views/PercentageUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/PercentageUpDownDemo.xaml
@@ -1,381 +1,395 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.PercentageUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:NumericUpDownLib.Converters;assembly=NumericUpDownLib"
-		xmlns:democonv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.Resources>
-			<democonv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			<conv:FactorToDoubleConverter x:Key="FactorToDoubleConverter" Factor="100.0" />
-		</Grid.Resources>
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.PercentageUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:NumericUpDownLib.Converters;assembly=NumericUpDownLib"
+        xmlns:democonv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.Resources>
+            <democonv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            <conv:FactorToDoubleConverter x:Key="FactorToDoubleConverter" Factor="100.0" />
+        </Grid.Resources>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
-
-		<cntrl:DoubleUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="7"
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <cntrl:DoubleUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="7"
             FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MinValue="{Binding MinimumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Converter={StaticResource FactorToDoubleConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
-
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value Bound:" />
-							<Slider
-								IsSnapToTickEnabled="True"
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								TickFrequency="0.1"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								IsSnapToTickEnabled="True"
-								Maximum="1"
-								Minimum="0"
-								TickFrequency="0.0001"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
-
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								IsSnapToTickEnabled="True"
-								Maximum="1"
-								Minimum="0"
-								TickFrequency="0.01"
-								Value="0" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								IsSnapToTickEnabled="True"
-								Maximum="1"
-								Minimum="0"
-								TickFrequency="0.01"
-								Value="1" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
-
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
-
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
-
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
-
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
-
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
-
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
-
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
-
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border>
-								<StackPanel Margin="3">
-									<cntrl:DoubleUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
-
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
-
-					<StackPanel Margin="0,6,0,0">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<!--  Heading  -->
-								<ColumnDefinition Width="Auto" />
-								<!--  Min  -->
-								<ColumnDefinition Width="Auto" />
-								<!--  Max  -->
-								<ColumnDefinition Width="Auto" />
-								<!--  Value  -->
-								<ColumnDefinition Width="Auto" />
-
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-
-							<Border
-								Grid.Row="0"
-								Grid.Column="0"
-								Grid.ColumnSpan="4"
-								Background="#20808080" />
-							<Border
-								Grid.Row="0"
-								Grid.RowSpan="3"
-								Grid.Column="0"
-								Background="#20808080" />
-
-							<TextBlock
-								Grid.Row="0"
-								Grid.Column="1"
-								Margin="3,0,6,0"
-								Padding="0,0,0,0"
-								FontWeight="ExtraBold"
-								Text="Minimum" />
-
-							<TextBlock
-								Grid.Row="0"
-								Grid.Column="2"
-								Margin="0,0,6,0"
-								FontWeight="ExtraBold"
-								Text="Maximum" />
-
-							<TextBlock
-								Grid.Row="0"
-								Grid.Column="3"
-								Margin="0,0,6,0"
-								FontWeight="ExtraBold"
-								Text="Value" />
-
-							<TextBlock
-								Grid.Row="1"
-								Grid.Column="0"
-								Margin="0,0,6,0"
-								HorizontalAlignment="Right"
-								FontWeight="ExtraBold"
-								Text="Original Values Bound:" />
-
-							<TextBlock
-								Grid.Row="1"
-								Grid.Column="1"
-								Margin="3"
-								Text="{Binding MinimumValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBlock
-								Grid.Row="1"
-								Grid.Column="2"
-								Margin="3"
-								Text="{Binding MaximumValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBlock
-								Grid.Row="1"
-								Grid.Column="3"
-								Margin="3"
-								Text="{Binding Value, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-
-							<TextBlock
-								Grid.Row="2"
-								Grid.Column="0"
-								Margin="0,0,6,0"
-								HorizontalAlignment="Right"
-								FontWeight="ExtraBold"
-								Text="Converted Values:" />
-
-							<TextBlock
-								Grid.Row="2"
-								Grid.Column="1"
-								Margin="3"
-								Text="{Binding MinimumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBlock
-								Grid.Row="2"
-								Grid.Column="2"
-								Margin="3"
-								Text="{Binding MaximumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBlock
-								Grid.Row="2"
-								Grid.Column="3"
-								Margin="3"
-								Text="{Binding Value, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-
-							<TextBlock
-								Grid.Row="0"
-								Grid.RowSpan="3"
-								Grid.Column="4"
-								Margin="6"
-								TextWrapping="Wrap">
-								This sample demonstrates the usage of a converter to scale between
-								the up/down value being displayed and manipulated versus the value being
-								stored in the backend.<LineBreak /><LineBreak />
-								A converter is used at the binding of the up/down control to scale
-								values up and down as the data goes from the viewmodel to the view
-								and vice versa.</TextBlock>
-						</Grid>
-					</StackPanel>
-
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<democonv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
-
-
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
-
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
-
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
-
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MinValue="{Binding MinimumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Converter={StaticResource FactorToDoubleConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
+
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value Bound:" />
+                            <Slider
+                                IsSnapToTickEnabled="True"
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                TickFrequency="0.1"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                IsSnapToTickEnabled="True"
+                                Maximum="1"
+                                Minimum="0"
+                                TickFrequency="0.0001"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                IsSnapToTickEnabled="True"
+                                Maximum="1"
+                                Minimum="0"
+                                TickFrequency="0.01"
+                                Value="0" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                IsSnapToTickEnabled="True"
+                                Maximum="1"
+                                Minimum="0"
+                                TickFrequency="0.01"
+                                Value="1" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
+
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
+
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
+
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
+
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
+
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border>
+                                <StackPanel Margin="3">
+                                    <cntrl:DoubleUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
+
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
+
+                    <StackPanel Margin="0,6,0,0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <!--  Heading  -->
+                                <ColumnDefinition Width="Auto" />
+                                <!--  Min  -->
+                                <ColumnDefinition Width="Auto" />
+                                <!--  Max  -->
+                                <ColumnDefinition Width="Auto" />
+                                <!--  Value  -->
+                                <ColumnDefinition Width="Auto" />
+
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <Border
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="4"
+                                Background="#20808080" />
+                            <Border
+                                Grid.Row="0"
+                                Grid.RowSpan="3"
+                                Grid.Column="0"
+                                Background="#20808080" />
+
+                            <TextBlock
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Margin="3,0,6,0"
+                                Padding="0,0,0,0"
+                                FontWeight="ExtraBold"
+                                Text="Minimum" />
+
+                            <TextBlock
+                                Grid.Row="0"
+                                Grid.Column="2"
+                                Margin="0,0,6,0"
+                                FontWeight="ExtraBold"
+                                Text="Maximum" />
+
+                            <TextBlock
+                                Grid.Row="0"
+                                Grid.Column="3"
+                                Margin="0,0,6,0"
+                                FontWeight="ExtraBold"
+                                Text="Value" />
+
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="0,0,6,0"
+                                HorizontalAlignment="Right"
+                                FontWeight="ExtraBold"
+                                Text="Original Values Bound:" />
+
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Margin="3"
+                                Text="{Binding MinimumValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="2"
+                                Margin="3"
+                                Text="{Binding MaximumValue, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="3"
+                                Margin="3"
+                                Text="{Binding Value, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="0,0,6,0"
+                                HorizontalAlignment="Right"
+                                FontWeight="ExtraBold"
+                                Text="Converted Values:" />
+
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Margin="3"
+                                Text="{Binding MinimumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="2"
+                                Margin="3"
+                                Text="{Binding MaximumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="3"
+                                Margin="3"
+                                Text="{Binding Value, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <TextBlock
+                                Grid.Row="0"
+                                Grid.RowSpan="3"
+                                Grid.Column="4"
+                                Margin="6"
+                                TextWrapping="Wrap">
+                                This sample demonstrates the usage of a converter to scale between
+                                the up/down value being displayed and manipulated versus the value being
+                                stored in the backend.<LineBreak /><LineBreak />
+                                A converter is used at the binding of the up/down control to scale
+                                values up and down as the data goes from the viewmodel to the view
+                                and vice versa.</TextBlock>
+                        </Grid>
+                    </StackPanel>
+
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <democonv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
+
+
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -389,8 +403,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
index b872464..571944e 100644
--- a/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
@@ -1,264 +1,278 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.SByteUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.SByteUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:SByteUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <cntrl:SByteUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="-512"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="-512"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="512"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:SByteUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:SByteUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -272,8 +286,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
index 540d351..24ad580 100644
--- a/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
@@ -1,264 +1,278 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.ShortUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.ShortUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:ShortUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <cntrl:ShortUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="-32767"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="-32767"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="32767"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="32767"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:ShortUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:ShortUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -272,8 +286,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
index 4957aef..287c63b 100644
--- a/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
@@ -1,265 +1,279 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.UIntegerUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.UIntegerUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<!--  Moved to ViewModel FormatString="D8" to support Hex Display On/Off  -->
-		<cntrl:UIntegerUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="10"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <!--  Moved to ViewModel FormatString="D8" to support Hex Display On/Off  -->
+        <cntrl:UIntegerUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="10"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="0"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="0"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="32767000"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="32767000"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:UIntegerUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:UIntegerUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -273,8 +287,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
index 672d2b5..efbcf25 100644
--- a/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
@@ -1,264 +1,278 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.ULongUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.ULongUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
 
-		<cntrl:ULongUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <cntrl:ULongUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="0"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="0"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="32767000"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="32767000"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:ULongUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:ULongUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -272,8 +286,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
index b575d87..c2de250 100644
--- a/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
@@ -1,263 +1,277 @@
 <UserControl
-	x:Class="UpDownDemoLib.Views.UShortUpDownDemo"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-	<Grid
-		xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
-		xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
-		Grid.Row="1"
-		Grid.Column="0"
-		Grid.ColumnSpan="2">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
+    x:Class="UpDownDemoLib.Views.UShortUpDownDemo"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        xmlns:cntrl="clr-namespace:NumericUpDownLib;assembly=NumericUpDownLib"
+        xmlns:conv="clr-namespace:UpDownDemoLib.Converters"
+        Grid.Row="1"
+        Grid.Column="0"
+        Grid.ColumnSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-			<RowDefinition />
-		</Grid.RowDefinitions>
-		<cntrl:UShortUpDown
-			Name="SampleUpDown"
-			Grid.Column="0"
-			Margin="3"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			HorizontalContentAlignment="{Binding HzntalContentAlignment}"
-			DisplayLength="5"
-			FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			IsDisplayLengthFixed="True"
-			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-			IsReadOnly="False"
-            IsUpdateValueWhenLostFocus="True"
-			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			MaxValue="{Binding MaximumValue}"
-			MinValue="{Binding MinimumValue}"
-			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-			Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <cntrl:UShortUpDown
+            Name="SampleUpDown"
+            Grid.Column="0"
+            Margin="3"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="{Binding HzntalContentAlignment}"
+            DisplayLength="5"
+            FormatString="{Binding FormatString, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            IsDisplayLengthFixed="True"
+            IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+            IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+            LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            MaxValue="{Binding MaximumValue}"
+            MinValue="{Binding MinimumValue}"
+            MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            NumberStyle="{Binding NumberStyle, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+            Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <GridSplitter Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="5" HorizontalAlignment="Stretch" />
+        <GridSplitter
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="1"
+            Width="5"
+            HorizontalAlignment="Stretch" />
 
-        <Grid Grid.Row="0" Grid.Column="2" Margin="12,3,3,3">
-			<Grid.Resources>
-				<conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-			</Grid.Resources>
-			<GroupBox Header="Debugging Values">
-				<StackPanel>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="2*" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+        <Grid
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="12,3,3,3">
+            <Grid.Resources>
+                <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            </Grid.Resources>
+            <GroupBox Header="Debugging Values">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Grid.Column="0" Margin="3">
-							<Label Content="Actual Value:" />
-							<Slider
-								Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-						<StackPanel Grid.Column="1" Margin="3">
-							<Label Content="Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The StepSize changes the size of increment on button click."
-								Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-						<StackPanel Grid.Column="2" Margin="3">
-							<Label Content="Large Step Size:" />
-							<Slider
-								Maximum="512"
-								Minimum="1"
-								ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
-								Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-							<TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="0" Margin="3">
+                            <Label Content="Actual Value:" />
+                            <Slider
+                                Maximum="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="3">
+                            <Label Content="Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The StepSize changes the size of increment on button click."
+                                Value="{Binding StepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                        <StackPanel Grid.Column="2" Margin="3">
+                            <Label Content="Large Step Size:" />
+                            <Slider
+                                Maximum="512"
+                                Minimum="1"
+                                ToolTip="The LargeStepSize changes a LARGE size of increment on cursor/mouse drag right/left."
+                                Value="{Binding LargeStepSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBox IsReadOnly="True" Text="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </StackPanel>
+                    </Grid>
 
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-						<StackPanel Margin="12">
-							<Label Content="Minimum Value:" />
-							<Slider
-								Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Minimum="0"
-								Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
+                        <StackPanel Margin="12">
+                            <Label Content="Minimum Value:" />
+                            <Slider
+                                Maximum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Minimum="0"
+                                Value="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MinimumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
 
-						<StackPanel Grid.Column="2" Margin="12">
-							<Label Content="Maximum Value:" />
-							<Slider
-								Maximum="64534"
-								Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-								Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-							<TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-						</StackPanel>
-					</Grid>
+                        <StackPanel Grid.Column="2" Margin="12">
+                            <Label Content="Maximum Value:" />
+                            <Slider
+                                Maximum="64534"
+                                Minimum="{Binding Value, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                Value="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                            <TextBox IsReadOnly="True" Text="{Binding MaximumValue, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
 
-					<StackPanel Margin="12">
-						<Label Content="Display Length:" />
-						<Slider
-							Maximum="255"
-							Minimum="0"
-							Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
-						<TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
-					</StackPanel>
+                    <StackPanel Margin="12">
+                        <Label Content="Display Length:" />
+                        <Slider
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{Binding DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=SampleUpDown}" />
+                        <TextBox IsReadOnly="True" Text="{Binding ElementName=SampleUpDown, Path=DisplayLength, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Content="Is Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
-							ToolTip="Check if value changes as expected when control is invisible." />
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is IncDec Button Visible"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
-							ToolTip="Check to test visibility of radio buttons." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Content="Is Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}"
+                            ToolTip="Check if value changes as expected when control is invisible." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is IncDec Button Visible"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsIncDecButtonsVisible}"
+                            ToolTip="Check to test visibility of radio buttons." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Display Length Fixed"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
-							ToolTip="Determines whether control shrinks or grows with its text portion input." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Display Length Fixed"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsDisplayLengthFixed}"
+                            ToolTip="Determines whether control shrinks or grows with its text portion input." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is ReadOnly"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
-							ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is ReadOnly"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsReadOnly}"
+                            ToolTip="Setting the control readonly enables the buttons but disables textbox edits." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
-							ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsEnabled}"
+                            ToolTip="Setting the control IsEnabled=False disables all edit capabilities." />
+                    </StackPanel>
 
-					<StackPanel Margin="3" Orientation="Horizontal">
-						<CheckBox
-							Name="IsMouseDragEnabledCheckBox"
-							Margin="0,0,0,0"
-							Content="Is Mouse Drag Enabled"
-							IsChecked="True"
-							ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
+                    <StackPanel Margin="3" Orientation="Horizontal">
+                        <CheckBox
+                            Name="IsMouseDragEnabledCheckBox"
+                            Margin="0,0,0,0"
+                            Content="Is Mouse Drag Enabled"
+                            IsChecked="True"
+                            ToolTip="Increment/Decrementing value with mouse drag should be possible if this is enabled." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Large Step Enabled"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
-							ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Large Step Enabled"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsLargeStepEnabled, Mode=TwoWay}"
+                            ToolTip="Setting this controls whether large step increments can be input via mouse drag or keyboard." />
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="Is Hex Display Enabled"
-							IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
-							ToolTip="" />
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="Is Hex Display Enabled"
+                            IsChecked="{Binding Path=IsHexDisplayEnabled, Mode=TwoWay}"
+                            ToolTip="" />
 
-						<ComboBox
-							Width="120"
-							Margin="21,0,0,0"
-							IsEditable="False"
-							Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
-							ToolTip="Changes the alignment of the text shown in the textbox portion"
-							ToolTipService.IsEnabled="True">
-							<ComboBoxItem>Left</ComboBoxItem>
-							<ComboBoxItem>Center</ComboBoxItem>
-							<ComboBoxItem>Right</ComboBoxItem>
-							<ComboBoxItem>Stretch</ComboBoxItem>
-						</ComboBox>
-					</StackPanel>
+                        <ComboBox
+                            Width="120"
+                            Margin="21,0,0,0"
+                            IsEditable="False"
+                            Text="{Binding Path=HzntalContentAlignment, Mode=TwoWay}"
+                            ToolTip="Changes the alignment of the text shown in the textbox portion"
+                            ToolTipService.IsEnabled="True">
+                            <ComboBoxItem>Left</ComboBoxItem>
+                            <ComboBoxItem>Center</ComboBoxItem>
+                            <ComboBoxItem>Right</ComboBoxItem>
+                            <ComboBoxItem>Stretch</ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
 
-					<StackPanel Margin="0,6,0,0" Orientation="Horizontal">
-						<CheckBox
-							x:Name="IsPopUpOpen"
-							Content="PopUp Test"
-							ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
-						<Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
-							<Border
-								Background="{StaticResource PopUpBackground}"
-								BorderBrush="{StaticResource PopUpBorder}"
-								BorderThickness="1">
-								<StackPanel Margin="3">
-									<cntrl:UShortUpDown
-										Name="SamplePopUpDown"
-										Grid.Column="0"
-										Margin="3"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top"
-										DisplayLength="13"
-										IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
-										IsReadOnly="False"
-										LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										MaxValue="{Binding MaximumValue}"
-										MinValue="{Binding MinimumValue}"
-										MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-										Visibility="Hidden"
-										Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
+                        <CheckBox
+                            x:Name="IsPopUpOpen"
+                            Content="PopUp Test"
+                            ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
+                        <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
+                            <Border
+                                Background="{StaticResource PopUpBackground}"
+                                BorderBrush="{StaticResource PopUpBorder}"
+                                BorderThickness="1">
+                                <StackPanel Margin="3">
+                                    <cntrl:UShortUpDown
+                                        Name="SamplePopUpDown"
+                                        Grid.Column="0"
+                                        Margin="3"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        DisplayLength="13"
+                                        IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
+                                        IsReadOnly="False"
+                                        LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        MaxValue="{Binding MaximumValue}"
+                                        MinValue="{Binding MinimumValue}"
+                                        MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        StepSize="{Binding StepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ToolTip="{Binding ToolTip, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                        Visibility="Hidden"
+                                        Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-									<StackPanel Margin="3">
-										<Label Content="Is Visible:" />
-										<CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
-									</StackPanel>
-									<TextBlock Text="Pop Up Is Open." />
-								</StackPanel>
-							</Border>
-						</Popup>
+                                    <StackPanel Margin="3">
+                                        <Label Content="Is Visible:" />
+                                        <CheckBox IsChecked="{Binding ElementName=SamplePopUpDown, Path=Visibility, Converter={StaticResource BoolToVisibilityConverter}}" ToolTip="Check if value changes as expected when control is invisible." />
+                                    </StackPanel>
+                                    <TextBlock Text="Pop Up Is Open." />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
 
-						<CheckBox
-							Margin="21,0,0,0"
-							Content="EnableValidatingIndicator"
-							IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
-							ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
-					</StackPanel>
+                        <CheckBox
+                            Margin="21,0,0,0"
+                            Content="EnableValidatingIndicator"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=EnableValidatingIndicator, Mode=TwoWay}"
+                            ToolTip="Toggles whether a validation indicator is shown in the upper left corner of the control." />
+                        <CheckBox
+                            Name="UpdateValueWhenLostFocusCheckBox"
+                            Margin="21,0,0,0"
+                            Content="UpdateValueWhenLostFocus"
+                            IsChecked="{Binding ElementName=SampleUpDown, Path=IsUpdateValueWhenLostFocus, Mode=TwoWay}"
+                            ToolTip="Toggles UpdateValueWhenLostFocus." />
+                    </StackPanel>
 
-					<Border
-						Margin="0,3"
-						BorderBrush="Gray"
-						BorderThickness="1">
-						<StackPanel xmlns:input="System.Windows.Input" Margin="3">
-							<StackPanel.Resources>
-								<conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
-							</StackPanel.Resources>
+                    <Border
+                        Margin="0,3"
+                        BorderBrush="Gray"
+                        BorderThickness="1">
+                        <StackPanel xmlns:input="System.Windows.Input" Margin="3">
+                            <StackPanel.Resources>
+                                <conv:EnumMatchToBooleanConverter x:Key="enumConverter" />
+                            </StackPanel.Resources>
 
 
-							<TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
+                            <TextBlock Margin="3" Text="Press this key to accelerate increments/decrements when scrolling with mouse wheel." />
 
-							<RadioButton
-								Margin="3"
-								Content="Alt"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Alt"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Alt}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Control"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
+                            <RadioButton
+                                Margin="3"
+                                Content="Control"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Control}" />
 
-							<RadioButton
-								Margin="3"
-								Content="Shift"
-								IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
-						</StackPanel>
-					</Border>
+                            <RadioButton
+                                Margin="3"
+                                Content="Shift"
+                                IsChecked="{Binding Path=AccelModifierKey, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Shift}" />
+                        </StackPanel>
+                    </Border>
                     <Border
                         Margin="0,3"
                         BorderBrush="Gray"
@@ -271,8 +285,8 @@
 
                     </Border>
                 </StackPanel>
-			</GroupBox>
-		</Grid>
-	</Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
 
 </UserControl>

From deb5a38ff6ac0d4f212e30dddc3f95f0c2f8eebf Mon Sep 17 00:00:00 2001
From: heartacker <heartacker@outlook.com>
Date: Sun, 26 Mar 2023 06:46:53 +0800
Subject: [PATCH 2/2] change static resource to dynamic resource to fix the ide
 error

---
 source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml     | 2 +-
 source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml  | 4 ++--
 source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml    | 4 ++--
 source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml     | 4 ++--
 source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml  | 4 ++--
 source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml    | 4 ++--
 source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml    | 4 ++--
 source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml | 4 ++--
 source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml    | 4 ++--
 source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml   | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
index dc76ece..05c739c 100644
--- a/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
@@ -214,7 +214,7 @@
                                         DisplayLength="13"
                                         IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
                                         IsReadOnly="False"
-                                        IsUpdateValueWhenLostFocus="{Binding ElementName=UpdateValueWhenLostFocusCheckBox, Path=IsChecked}"
+                                        IsUpdateValueWhenLostFocus="True"
                                         LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
                                         MaxValue="{Binding MaximumValue}"
                                         MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
index df8c4cf..787f1bb 100644
--- a/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
@@ -193,8 +193,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:DecimalUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
index 41c0195..98a44bb 100644
--- a/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
@@ -193,8 +193,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:FloatUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
index 5f30942..cedb5b6 100644
--- a/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
@@ -200,8 +200,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:LongUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
index 430cdfc..618e8da 100644
--- a/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
@@ -200,8 +200,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:NumericUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
index 571944e..83019b9 100644
--- a/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
@@ -201,8 +201,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:SByteUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
index 24ad580..cd8ce3b 100644
--- a/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
@@ -201,8 +201,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:ShortUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
index 287c63b..bda91fe 100644
--- a/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
@@ -202,8 +202,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:UIntegerUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
index efbcf25..848bafe 100644
--- a/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
@@ -201,8 +201,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:ULongUpDown
diff --git a/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
index c2de250..ef357e8 100644
--- a/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
+++ b/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
@@ -200,8 +200,8 @@
                             ToolTip="Test whether the numeric control can be used in a Pop-uo control." />
                         <Popup AllowsTransparency="True" IsOpen="{Binding ElementName=IsPopUpOpen, Path=IsChecked}">
                             <Border
-                                Background="{StaticResource PopUpBackground}"
-                                BorderBrush="{StaticResource PopUpBorder}"
+                                Background="{DynamicResource PopUpBackground}"
+                                BorderBrush="{DynamicResource PopUpBorder}"
                                 BorderThickness="1">
                                 <StackPanel Margin="3">
                                     <cntrl:UShortUpDown