diff --git a/WindowsPhone/BarcodeScanner/deploy/BarcodeScanner.dll b/WindowsPhone/BarcodeScanner/deploy/BarcodeScanner.dll
index 3f800a6..e5ba5f7 100644
Binary files a/WindowsPhone/BarcodeScanner/deploy/BarcodeScanner.dll and b/WindowsPhone/BarcodeScanner/deploy/BarcodeScanner.dll differ
diff --git a/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml b/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml
index 4b6d2b2..d46b583 100644
--- a/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml
+++ b/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml
@@ -36,6 +36,13 @@
                 </VideoBrush>
             </Rectangle.Fill>
         </Rectangle>
+        <Button Height="100" Width="100" x:Name="_focusButton"
+                Click="_focusButton_Click" Margin="368,656,12,44"
+                FontSize="18" Background="Black" Foreground="White">
+            <TextBlock Text="Focus"/>
+        </Button>
+        <Border Height="400" Width="240" BorderBrush="Green" BorderThickness="3">
+        </Border>
     </Grid>
  
 
diff --git a/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml.cs b/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml.cs
index c40c6e6..1df90c8 100644
--- a/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml.cs
+++ b/WindowsPhone/BarcodeScanner/sources/BarcodeScanner/Scanner.xaml.cs
@@ -120,6 +120,7 @@ namespace BarcodeScanner
                 return false;
             }
             _timer.Stop();
+            _timer = null;
             _luminance = null;
             _reader = null;
             _photoCamera.Dispose();
@@ -127,5 +128,20 @@ namespace BarcodeScanner
 
             return true;
         }
+
+        private void _focusButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (_photoCamera != null && _photoCamera.IsFocusSupported)
+            {
+                try
+                {
+                    _photoCamera.CancelFocus();
+                    _photoCamera.Focus();
+                }
+                catch
+                {
+                }
+            }
+        }
     }
 }
\ No newline at end of file