diff --git a/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml b/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml
index 7338e68..a5e8da1 100644
--- a/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml	
+++ b/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml	
@@ -1,27 +1,79 @@
-<Window
-  x:Class="Samples.Tutorials.ContextMenus.InlineContextMenuWindow"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:tb="http://www.hardcodet.net/taskbar"
-  Height="300"
-  Width="300">
-  <Grid>
+<Window x:Class="Samples.Tutorials.ContextMenus.InlineContextMenuWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:tb="http://www.hardcodet.net/taskbar"
+        xmlns:commands="clr-namespace:Samples.Commands"
+        Height="300"
+        Width="300">
+    <Grid>
 
-    <tb:TaskbarIcon
-      x:Name="MyNotifyIcon"
-      IconSource="/Icons/Error.ico"
-      ToolTipText="hello world">
+        <tb:TaskbarIcon x:Name="MyNotifyIcon"
+                        IconSource="/Icons/Error.ico"
+                        ToolTipText="hello world"
+                        TrayContextMenuOpen="MyNotifyIcon_TrayContextMenuOpen"
+                        PreviewTrayContextMenuOpen="MyNotifyIcon_PreviewTrayContextMenuOpen">
 
-      <!-- Set a simple context menu  -->
-      <tb:TaskbarIcon.ContextMenu>
-        <ContextMenu>
-          <MenuItem Header="First Menu Item" />
-          <MenuItem Header="Second Menu Item" />
-        </ContextMenu>
-      </tb:TaskbarIcon.ContextMenu>
+            <!-- Set a simple context menu  -->
+            <!-- the data context of the context menu is the NotifyIcon itself (see more about this in DataBinding samples) -->
+            <tb:TaskbarIcon.ContextMenu>
+                <ContextMenu>
+                    <TextBlock Text="Hiding the sample window will not close it!" />
+                    <MenuItem Header="_Show Sample Window [S]"
+                              Command="{commands:ShowSampleWindowCommand}"
+                              CommandParameter="{Binding}">
+                        <MenuItem.Icon>
+                            <Image Width="16"
+                                   Height="16"
+                                   Source="/Images/Add.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
 
-    </tb:TaskbarIcon>
-    <TextBlock Margin="26,26,24,0" VerticalAlignment="Top" FontWeight="Bold" TextWrapping="Wrap"><Run Language="de-ch" Text="Right-click on NotifyIcon to open Context Menu"/></TextBlock>
+                    <Separator />
 
-  </Grid>
+                    <MenuItem Header="_Hide Sample Window [H]"
+                              Command="{commands:HideSampleWindowCommand}"
+                              CommandParameter="{Binding}">
+                        <MenuItem.Icon>
+                            <Image Width="16"
+                                   Height="16"
+                                   Source="/Images/Remove.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </tb:TaskbarIcon.ContextMenu>
+
+        </tb:TaskbarIcon>
+        <TextBlock Margin="26,26,24,0"
+                   VerticalAlignment="Top"
+                   FontWeight="Bold"
+                   TextWrapping="Wrap"><Run Language="de-ch"
+                                            Text="Right-click on NotifyIcon to open Context Menu" /></TextBlock>
+        <TextBlock HorizontalAlignment="Left"
+                   Margin="26,83,0,0"
+                   TextWrapping="Wrap"
+                   Text="Context menu preview open events:"
+                   VerticalAlignment="Top" />
+        <TextBlock HorizontalAlignment="Left"
+                   Margin="26,103.96,0,0"
+                   TextWrapping="Wrap"
+                   Text="Context menu open events:"
+                   VerticalAlignment="Top" />
+        <TextBlock x:Name="PreviewOpenEventCounter"
+                   HorizontalAlignment="Left"
+                   Margin="246,83,0,0"
+                   TextWrapping="Wrap"
+                   Text="0"
+                   VerticalAlignment="Top" />
+        <TextBlock x:Name="OpenEventCounter"
+                   HorizontalAlignment="Left"
+                   Margin="246,106.97,0,0"
+                   TextWrapping="Wrap"
+                   Text="0"
+                   VerticalAlignment="Top" />
+        <CheckBox x:Name="SuppressContextMenu"
+                  Content="Suppress context menu in preview event"
+                  HorizontalAlignment="Left"
+                  Margin="26,190,0,0"
+                  VerticalAlignment="Top" />
+    </Grid>
 </Window>
\ No newline at end of file
diff --git a/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs b/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs
index fea9324..6c156b5 100644
--- a/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs	
+++ b/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs	
@@ -1,35 +1,40 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace Samples.Tutorials.ContextMenus
 {
-  /// <summary>
-  /// Interaction logic for InlineContextMenuWindow.xaml
-  /// </summary>
-  public partial class InlineContextMenuWindow : Window
-  {
-    public InlineContextMenuWindow()
+    /// <summary>
+    /// Interaction logic for InlineContextMenuWindow.xaml
+    /// </summary>
+    public partial class InlineContextMenuWindow : Window
     {
-      InitializeComponent();
+        public InlineContextMenuWindow()
+        {
+            InitializeComponent();
+        }
+
+
+        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+        {
+            //clean up notifyicon (would otherwise stay open until application finishes)
+            MyNotifyIcon.Dispose();
+
+            base.OnClosing(e);
+        }
+
+        private void MyNotifyIcon_TrayContextMenuOpen(object sender, System.Windows.RoutedEventArgs e)
+        {
+            OpenEventCounter.Text = (int.Parse(OpenEventCounter.Text) + 1).ToString();
+        }
+
+        private void MyNotifyIcon_PreviewTrayContextMenuOpen(object sender, System.Windows.RoutedEventArgs e)
+        {
+            //marking the event as handled suppresses the context menu
+            e.Handled = (bool)SuppressContextMenu.IsChecked;
+
+            PreviewOpenEventCounter.Text = (int.Parse(PreviewOpenEventCounter.Text) + 1).ToString();
+        }
     }
-
-
-    protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
-    {
-      //clean up notifyicon (would otherwise stay open until application finishes)
-      MyNotifyIcon.Dispose();
-
-      base.OnClosing(e);
-    }
-  }
-}
+}
\ No newline at end of file