diff --git a/ConsoleFramework/ConsoleApplication.cs b/ConsoleFramework/ConsoleApplication.cs
index 1176e79..79bb175 100644
--- a/ConsoleFramework/ConsoleApplication.cs
+++ b/ConsoleFramework/ConsoleApplication.cs
@@ -191,12 +191,15 @@ public static Control LoadFromXaml( string xamlResourceName, object dataContext
                 }
                 using ( StreamReader reader = new StreamReader( stream ) ) {
                     string result = reader.ReadToEnd( );
-                    return XamlParser.CreateFromXaml<Control>(result, dataContext, new List<string>()
+                    Control control = XamlParser.CreateFromXaml<Control>(result, dataContext, new List<string>()
                     {
                         "clr-namespace:Xaml;assembly=Xaml",
                         "clr-namespace:ConsoleFramework.Xaml;assembly=ConsoleFramework",
                         "clr-namespace:ConsoleFramework.Controls;assembly=ConsoleFramework",
                     });
+                    control.DataContext = dataContext;
+                    control.Created( );
+                    return control;
                 }
             }
         }
@@ -720,10 +723,14 @@ private void processLinuxInput (TermKeyKey key)
 				inputRecord.MouseEvent.dwMousePosition = new COORD((short) (col - 1), (short) (line - 1));
 				if (ev == TermKeyMouseEvent.TERMKEY_MOUSE_RELEASE) {
 					inputRecord.MouseEvent.dwButtonState = 0;
-				} else if (ev == TermKeyMouseEvent.TERMKEY_MOUSE_DRAG) {
-					inputRecord.MouseEvent.dwButtonState = MOUSE_BUTTON_STATE.FROM_LEFT_1ST_BUTTON_PRESSED;
-				} else if (ev == TermKeyMouseEvent.TERMKEY_MOUSE_PRESS) {
-					inputRecord.MouseEvent.dwButtonState = MOUSE_BUTTON_STATE.FROM_LEFT_1ST_BUTTON_PRESSED;
+				} else if (ev == TermKeyMouseEvent.TERMKEY_MOUSE_DRAG || ev == TermKeyMouseEvent.TERMKEY_MOUSE_PRESS) {
+					if (1 == button) {
+						inputRecord.MouseEvent.dwButtonState = MOUSE_BUTTON_STATE.FROM_LEFT_1ST_BUTTON_PRESSED;
+					} else if (2 == button) {
+						inputRecord.MouseEvent.dwButtonState = MOUSE_BUTTON_STATE.FROM_LEFT_2ND_BUTTON_PRESSED;
+					} else if (3 == button) {
+						inputRecord.MouseEvent.dwButtonState = MOUSE_BUTTON_STATE.RIGHTMOST_BUTTON_PRESSED;
+					}
 				}
 				//
 				processInputEvent(inputRecord);
diff --git a/ConsoleFramework/ConsoleFramework.csproj b/ConsoleFramework/ConsoleFramework.csproj
index eb51f4a..885c97a 100644
--- a/ConsoleFramework/ConsoleFramework.csproj
+++ b/ConsoleFramework/ConsoleFramework.csproj
@@ -61,6 +61,7 @@
     <Compile Include="Controls\ButtonBase.cs" />
     <Compile Include="Controls\CheckBox.cs" />
     <Compile Include="Controls\ComboBox.cs" />
+    <Compile Include="Controls\ContextMenu.cs" />
     <Compile Include="Controls\Grid.cs" />
     <Compile Include="Controls\GroupBox.cs" />
     <Compile Include="Controls\ListBox.cs" />
@@ -69,6 +70,7 @@
     <Compile Include="Controls\ProgressBar.cs" />
     <Compile Include="Controls\RadioButton.cs" />
     <Compile Include="Controls\ScrollViewer.cs" />
+    <Compile Include="Controls\TabControl.cs" />
     <Compile Include="Controls\TextBox.cs" />
     <Compile Include="Controls\TreeView.cs" />
     <Compile Include="Controls\UIElementCollection.cs" />
diff --git a/ConsoleFramework/Controls/Button.cs b/ConsoleFramework/Controls/Button.cs
index 7174a3f..8e6d3da 100644
--- a/ConsoleFramework/Controls/Button.cs
+++ b/ConsoleFramework/Controls/Button.cs
@@ -20,7 +20,7 @@ public string Caption {
 
         protected override Size MeasureOverride(Size availableSize) {
             if (!string.IsNullOrEmpty(caption)) {
-                Size minButtonSize = new Size(caption.Length + 14, 2);
+                Size minButtonSize = new Size(caption.Length + 10, 2);
                 return minButtonSize;
             } else return new Size(8, 2);
         }
diff --git a/ConsoleFramework/Controls/ComboBox.cs b/ConsoleFramework/Controls/ComboBox.cs
index 0e6e0ac..37d3c89 100644
--- a/ConsoleFramework/Controls/ComboBox.cs
+++ b/ConsoleFramework/Controls/ComboBox.cs
@@ -208,7 +208,8 @@ private void OnKeyDown( object sender, KeyEventArgs args ) {
         }
 
         private void OnMouseDown( object sender, MouseButtonEventArgs mouseButtonEventArgs ) {
-            openPopup(  );
+            if ( !opened ) 
+                openPopup(  );
         }
 
         private void OnPopupClosed( object o, EventArgs args ) {
diff --git a/ConsoleFramework/Controls/ContextMenu.cs b/ConsoleFramework/Controls/ContextMenu.cs
new file mode 100644
index 0000000..8a40b58
--- /dev/null
+++ b/ConsoleFramework/Controls/ContextMenu.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Binding.Observables;
+using ConsoleFramework.Core;
+using ConsoleFramework.Events;
+using ConsoleFramework.Native;
+using Xaml;
+
+namespace ConsoleFramework.Controls
+{
+    [ContentProperty( "Items" )]
+    public class ContextMenu
+    {
+        private readonly ObservableList< MenuItemBase > items = new ObservableList< MenuItemBase >(
+            new List< MenuItemBase >( ) );
+
+        public IList< MenuItemBase > Items {
+            get { return items; }
+        }
+
+        private MenuItem.Popup popup;
+        private bool expanded;
+
+        private bool popupShadow = true;
+        public bool PopupShadow {
+            get { return popupShadow; }
+            set { popupShadow = value; }
+        }
+
+        /// <summary>
+        /// Forces all open submenus to be closed.
+        /// </summary>
+        public void CloseAllSubmenus( ) {
+            List<MenuItem> expandedSubmenus = new List< MenuItem >();
+            MenuItem currentItem = ( MenuItem ) this.Items.SingleOrDefault(
+                item => item is MenuItem && ((MenuItem)item).expanded);
+            while ( null != currentItem ) {
+                expandedSubmenus.Add( currentItem );
+                currentItem = (MenuItem)currentItem.Items.SingleOrDefault(
+                    item => item is MenuItem && ((MenuItem)item).expanded);
+            }
+            expandedSubmenus.Reverse( );
+            foreach ( MenuItem expandedSubmenu in expandedSubmenus ) {
+                expandedSubmenu.Close( );
+            }
+        }
+
+        private WindowsHost windowsHost;
+        private RoutedEventHandler windowsHostClick;
+        private KeyEventHandler windowsHostControlKeyPressed;
+
+        public void OpenMenu( WindowsHost windowsHost, Point point ) {
+            if ( expanded ) return;
+
+            // Вешаем на WindowsHost обработчик события MenuItem.ClickEvent,
+            // чтобы ловить момент выбора пункта меню в одном из модальных всплывающих окошек
+            // Дело в том, что эти окошки не являются дочерними элементами контрола Menu,
+            // а напрямую являются дочерними элементами WindowsHost (т.к. именно он создаёт
+            // окна). И событие выбора пункта меню из всплывающего окошка может быть поймано 
+            // в WindowsHost, но не в Menu. А нам нужно повесить обработчик, который закроет
+            // все показанные попапы.
+            EventManager.AddHandler( windowsHost, MenuItem.ClickEvent,
+                windowsHostClick = ( sender, args ) => {
+                    CloseAllSubmenus( );
+                    popup.Close(  );
+                }, true );
+
+            EventManager.AddHandler( windowsHost, MenuItem.Popup.ControlKeyPressedEvent,
+                windowsHostControlKeyPressed = ( sender, args ) => {
+                    CloseAllSubmenus( );
+                    //
+                    //ConsoleApplication.Instance.FocusManager.SetFocusScope(this);
+                    if ( args.wVirtualKeyCode == VirtualKeys.Right )
+                        ConsoleApplication.Instance.FocusManager.MoveFocusNext( );
+                    else if ( args.wVirtualKeyCode == VirtualKeys.Left )
+                        ConsoleApplication.Instance.FocusManager.MoveFocusPrev( );
+                    MenuItem focusedItem = ( MenuItem ) this.Items.SingleOrDefault(
+                        item => item is MenuItem && item.HasFocus );
+                    focusedItem.Expand( );
+                } );
+
+            if ( null == popup ) {
+                popup = new MenuItem.Popup( this.Items, this.popupShadow, 0 );
+                popup.AddHandler( Window.ClosedEvent, new EventHandler( onPopupClosed ) );
+            }
+            popup.X = point.X;
+            popup.Y = point.Y;
+            windowsHost.ShowModal( popup, true );
+            expanded = true;
+            this.windowsHost = windowsHost;
+        }
+
+        private void onPopupClosed( object sender, EventArgs eventArgs ) {
+            if (!expanded) throw new InvalidOperationException("This shouldn't happen");
+            expanded = false;
+            EventManager.RemoveHandler( windowsHost, MenuItem.ClickEvent, windowsHostClick );
+            EventManager.RemoveHandler( windowsHost, MenuItem.Popup.ControlKeyPressedEvent,
+                windowsHostControlKeyPressed );
+        }
+    }
+}
\ No newline at end of file
diff --git a/ConsoleFramework/Controls/Control.cs b/ConsoleFramework/Controls/Control.cs
index 54a6bc0..069a7b3 100644
--- a/ConsoleFramework/Controls/Control.cs
+++ b/ConsoleFramework/Controls/Control.cs
@@ -230,9 +230,16 @@ public T FindDirectChildByName< T >( string name ) where T:Control {
         internal LayoutInfo layoutInfo = new LayoutInfo();
         internal LayoutInfo lastLayoutInfo = new LayoutInfo();
 
+        private Visibility visibility;
+
         public Visibility Visibility {
-            get;
-            set;
+            get { return visibility; }
+            set {
+                if ( visibility != value ) {
+                    visibility = value;
+                    Invalidate();
+                }
+            }
         }
 
         /// <summary>
@@ -1321,29 +1328,47 @@ protected static void assert( bool assertion ) {
 
         /// <summary>
         /// Определяет дочерний элемент, находящийся под курсором мыши,
-        /// и передаёт на него фокус, если он - Focusable и Visible.
+        /// и передаёт на него фокус, если он - Focusable. А если нажата правая кнопка мыши и у
+        /// контрола есть контекстное меню, активизирует его.
         /// </summary>
         protected void PassFocusToChildUnderPoint( MouseEventArgs args ) {
-            Control tofocus = null;
-            Control parent = this;
-            Control hitTested = null;
-            do
-            {
-                Point position = args.GetPosition(parent);
-                hitTested = parent.GetTopChildAtPoint(position);
-                if (null != hitTested)
-                {
-                    parent = hitTested;
-                    if (hitTested.Visibility == Visibility.Visible && hitTested.Focusable)
-                    {
-                        tofocus = hitTested;
+            Control topControl = VisualTreeHelper.FindTopControlUnderMouse( this, args.GetPosition( this ) );
+            if ( topControl != null ) {
+                if ( topControl.Focusable ) {
+                    ConsoleApplication.Instance.FocusManager.SetFocus(this, topControl);
+                }
+                if ( args.RightButton == MouseButtonState.Pressed ) {
+                    if ( topControl.ContextMenu != null ) {
+                        var windowsHost = VisualTreeHelper.FindClosestParent< WindowsHost >( this );
+                        topControl.ContextMenu.OpenMenu( windowsHost, args.GetPosition( windowsHost ) );
                     }
                 }
-            } while (hitTested != null);
-            if (tofocus != null)
-            {
-                ConsoleApplication.Instance.FocusManager.SetFocus(this, tofocus);
             }
         }
+
+        /// <summary>
+        /// This method is called after control has been created and filled with children.
+        /// todo : think about avoiding reentrant Created() calls
+        /// </summary>
+        public void Created( ) {
+            foreach ( var child in Children ) {
+                child.Created(  );
+            }
+            OnCreated(  );
+        }
+
+        /// <summary>
+        /// This method is invoked after control has been created and all children
+        /// controls are created too (and children' OnCreated called). So, you can
+        /// find any child control in this method and subscribe for events.
+        /// </summary>
+        protected virtual void OnCreated( ) {
+        }
+
+        private ContextMenu contextMenu;
+        public ContextMenu ContextMenu {
+            get { return contextMenu; }
+            set { contextMenu = value; }
+        }
     }
 }
diff --git a/ConsoleFramework/Controls/ListBox.cs b/ConsoleFramework/Controls/ListBox.cs
index dca3e38..bb6e0cf 100644
--- a/ConsoleFramework/Controls/ListBox.cs
+++ b/ConsoleFramework/Controls/ListBox.cs
@@ -21,7 +21,7 @@ public class ListBox : Control
         public int? PageSize { get; set; }
 
         private readonly ObservableList<string> items = new ObservableList<string>(new List<string>());
-        public IList<String>  Items {
+        public ObservableList<String>  Items {
             get { return items; }
         }
         
diff --git a/ConsoleFramework/Controls/MessageBox.cs b/ConsoleFramework/Controls/MessageBox.cs
index aa2cb15..87805d0 100644
--- a/ConsoleFramework/Controls/MessageBox.cs
+++ b/ConsoleFramework/Controls/MessageBox.cs
@@ -43,7 +43,9 @@ public static void Show( string title, string text, MessageBoxClosedEventHandler
             messageBox.Title = title;
             messageBox.Text = text;
             messageBox.AddHandler( ClosedEvent, new EventHandler(( sender, args ) => {
-                onClosed(MessageBoxResult.Button1);
+                if ( null != onClosed ) {
+                    onClosed( MessageBoxResult.Button1 );
+                }
             }) );
             //messageBox.X =
             windowsHost.ShowModal( messageBox );
diff --git a/ConsoleFramework/Controls/Panel.cs b/ConsoleFramework/Controls/Panel.cs
index b091ccd..b54050d 100644
--- a/ConsoleFramework/Controls/Panel.cs
+++ b/ConsoleFramework/Controls/Panel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using ConsoleFramework.Core;
 using ConsoleFramework.Native;
 using ConsoleFramework.Rendering;
@@ -131,6 +130,7 @@ public override void Render(RenderingBuffer buffer) {
                     buffer.SetPixel(x, y, ' ', Attr.BACKGROUND_BLUE |
                         Attr.BACKGROUND_GREEN | Attr.BACKGROUND_RED | Attr.FOREGROUND_BLUE |
                         Attr.FOREGROUND_GREEN | Attr.FOREGROUND_RED | Attr.FOREGROUND_INTENSITY);
+                    buffer.SetOpacity( x, y, 4 );
                 }
             }
         }
diff --git a/ConsoleFramework/Controls/ProgressBar.cs b/ConsoleFramework/Controls/ProgressBar.cs
index e59963d..654f783 100644
--- a/ConsoleFramework/Controls/ProgressBar.cs
+++ b/ConsoleFramework/Controls/ProgressBar.cs
@@ -1,4 +1,5 @@
-using ConsoleFramework.Core;
+using System;
+using ConsoleFramework.Core;
 using ConsoleFramework.Native;
 using ConsoleFramework.Rendering;
 
@@ -25,7 +26,7 @@ public override void Render( RenderingBuffer buffer ) {
             Attr attr = Colors.Blend( Color.DarkCyan, Color.DarkBlue );
             buffer.FillRectangle(0, 0, ActualWidth, ActualHeight, UnicodeTable.MediumShade, attr);
             int filled = ( int ) ( ActualWidth*( Percent*0.01 ) );
-            buffer.FillRectangle(0, 0, filled, ActualHeight, UnicodeTable.DarkShade, attr);
+            buffer.FillRectangle(0, 0, Math.Min( filled, ActualWidth ), ActualHeight, UnicodeTable.DarkShade, attr);
         }
     }
 }
diff --git a/ConsoleFramework/Controls/TabControl.cs b/ConsoleFramework/Controls/TabControl.cs
new file mode 100644
index 0000000..87751ec
--- /dev/null
+++ b/ConsoleFramework/Controls/TabControl.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ConsoleFramework.Core;
+using ConsoleFramework.Events;
+using ConsoleFramework.Native;
+using ConsoleFramework.Rendering;
+using Xaml;
+
+namespace ConsoleFramework.Controls
+{
+    public class TabDefinition
+    {
+        public string Title { get; set; }
+    }
+
+    /// <summary>
+    /// Control that presents a tabbed layout.
+    /// </summary>
+    [ContentProperty( "Controls" )]
+    public class TabControl : Control
+    {
+        private readonly List< TabDefinition > tabDefinitions = new List< TabDefinition >( );
+        private readonly UIElementCollection controls;
+
+        public TabControl( ) {
+            controls = new UIElementCollection( this );
+            AddHandler(MouseDownEvent, new MouseButtonEventHandler(mouseDown));
+        }
+
+        private void mouseDown( object sender, MouseButtonEventArgs args ) {
+            Point pos = args.GetPosition( this );
+            if ( pos.y > 2 ) return;
+
+            int x = 0;
+            for ( int i = 0; i < tabDefinitions.Count; i++ ) {
+                TabDefinition tabDefinition = tabDefinitions[ i ];
+                if ( pos.X > x && pos.X <= x + tabDefinition.Title.Length + 2 ) {
+                    activeTabIndex = i;
+                    Invalidate(  );
+                    break;
+                }
+                x += tabDefinition.Title.Length + 2 + 1; // Two spaces around + one vertical border
+            }
+            args.Handled = true;
+        }
+
+        public List< TabDefinition > TabDefinitions {
+            get { return tabDefinitions; }
+        }
+
+        public UIElementCollection Controls {
+            get { return controls; }
+        }
+
+        private int activeTabIndex;
+
+        public int ActiveTabIndex {
+            get { return activeTabIndex; }
+            set {
+                if ( value != activeTabIndex ) {
+                    if (value < 0 || value >= tabDefinitions.Count)
+                        throw new ArgumentException("Tab index out of bounds");
+                    activeTabIndex = value;
+                    Invalidate( );
+                }
+            }
+        }
+
+        protected override Size MeasureOverride( Size availableSize ) {
+            // Get children max desired size to determine the tab content desired size
+            Size childrenAvailableSize = new Size(
+                Math.Max( availableSize.Width - 2, 0 ),
+                Math.Max( availableSize.Height - 4, 0 ) );
+            int maxDesiredWidth = 0;
+            int maxDesiredHeight = 0;
+            for ( int i = 0; i < Math.Min( Children.Count, tabDefinitions.Count ); i++ ) {
+                Control child = Children[ i ];
+                child.Measure( childrenAvailableSize );
+                if ( child.DesiredSize.Width > maxDesiredWidth ) maxDesiredWidth = child.DesiredSize.Width;
+                if ( child.DesiredSize.Height > maxDesiredHeight ) maxDesiredHeight = child.DesiredSize.Height;
+            }
+
+            // Get tab header desired size
+            var tabHeaderWidth = getTabHeaderWidth( );
+
+            // Calculate final size = min(availableSize, controlWithChildrenDesiredSize)
+            Size controlWithChildrenDesiredSize = new Size(
+                Math.Max( maxDesiredWidth + 2, tabHeaderWidth ),
+                maxDesiredHeight + 4
+                );
+            Size finalAvailableSize = new Size(
+                Math.Min( availableSize.Width, controlWithChildrenDesiredSize.Width ),
+                Math.Min( availableSize.Height, controlWithChildrenDesiredSize.Height )
+                );
+
+            // Invoke children.Measure() with final size
+            for ( int i = 0; i < Children.Count; i++ ) {
+                Control child = Children[ i ];
+                if ( activeTabIndex == i ) {
+                    child.Measure( new Size(
+                        Math.Max( 0, finalAvailableSize.Width - 2 ),
+                        Math.Max( 0, finalAvailableSize.Height - 4 )
+                        ) );
+                } else {
+                    child.Measure( Size.Empty );
+                }
+            }
+
+            return finalAvailableSize;
+        }
+
+        private int getTabHeaderWidth( ) {
+            // Two spaces around + one vertical border per tab, plus extra one vertical border
+            return 1 + tabDefinitions.Sum( tabDefinition => tabDefinition.Title.Length + 2 + 1 );
+        }
+
+        protected override Size ArrangeOverride( Size finalSize ) {
+            for ( int i = 0; i < Children.Count; i++ ) {
+                Control child = Children[ i ];
+                if ( activeTabIndex == i ) {
+                    child.Arrange( new Rect(
+                        new Point( 1, 3 ),
+                        new Size( Math.Max( 0, finalSize.Width - 2 ),
+                            Math.Max( 0, finalSize.Height - 4 )
+                            ) ) );
+                } else {
+                    child.Arrange( Rect.Empty );
+                }
+            }
+            return finalSize;
+        }
+
+        private void renderBorderSafe( RenderingBuffer buffer, int x, int y, int x2, int y2 ) {
+            if ( ActualWidth > x && ActualHeight > y )
+                buffer.SetPixel( x, y, UnicodeTable.SingleFrameTopLeftCorner );
+            if ( ActualWidth > x && ActualHeight > y2 && y2 > y )
+                buffer.SetPixel( x, y2, UnicodeTable.SingleFrameBottomLeftCorner );
+            if ( ActualHeight > y )
+                for ( int i = x + 1; i <= Math.Min( x2 - 1, ActualWidth - 1 ); i++ )
+                    buffer.SetPixel( i, y, UnicodeTable.SingleFrameHorizontal );
+            if ( ActualHeight > y2 )
+                for ( int i = x + 1; i <= Math.Min( x2 - 1, ActualWidth - 1 ); i++ )
+                    buffer.SetPixel( i, y2, UnicodeTable.SingleFrameHorizontal );
+            if ( ActualWidth > x )
+                for ( int j = y + 1; j <= Math.Min( y2 - 1, ActualHeight - 1 ); j++ )
+                    buffer.SetPixel( x, j, UnicodeTable.SingleFrameVertical );
+            if ( ActualWidth > x2 )
+                for ( int j = y + 1; j <= Math.Min( y2 - 1, ActualHeight - 1 ); j++ )
+                    buffer.SetPixel( x2, j, UnicodeTable.SingleFrameVertical );
+            if ( ActualWidth > x2 && ActualHeight > y && x2 > x )
+                buffer.SetPixel( x2, y, UnicodeTable.SingleFrameTopRightCorner );
+            if ( ActualWidth > x2 && ActualHeight > y2 && y2 > y && x2 > x )
+                buffer.SetPixel( x2, y2, UnicodeTable.SingleFrameBottomRightCorner );
+        }
+
+        public override void Render( RenderingBuffer buffer ) {
+            Attr attr = Colors.Blend( Color.Black, Color.DarkGreen );
+            Attr inactiveAttr = Colors.Blend( Color.DarkGray, Color.DarkGreen );
+
+            // Transparent background for borders
+            buffer.SetOpacityRect( 0, 0, ActualWidth, ActualHeight, 3 );
+
+            buffer.FillRectangle( 0, 0, ActualWidth, ActualHeight, ' ', attr );
+
+            // Transparent child content part
+            if ( ActualWidth > 2 && ActualHeight > 3 )
+                buffer.SetOpacityRect( 1, 3, ActualWidth - 2, ActualHeight - 4, 2 );
+
+            renderBorderSafe( buffer, 0, 2, Math.Max( getTabHeaderWidth( ) - 1, ActualWidth - 1 ), ActualHeight - 1 );
+
+            // Start to render header
+            buffer.FillRectangle( 0, 0, ActualWidth, Math.Min( 2, ActualHeight ), ' ', attr );
+
+            int x = 0;
+
+            // Render tabs before active tab
+            for ( int tab = 0; tab < tabDefinitions.Count; x += TabDefinitions[ tab++ ].Title.Length + 3 ) {
+                var tabDefinition = TabDefinitions[ tab ];
+                if ( tab <= activeTabIndex ) {
+                    buffer.SetPixelSafe( x, 0, UnicodeTable.SingleFrameTopLeftCorner );
+                    buffer.SetPixelSafe( x, 1, UnicodeTable.SingleFrameVertical );
+                }
+                if ( tab == activeTabIndex ) {
+                    buffer.SetPixelSafe( x, 2,
+                        activeTabIndex == 0 ? UnicodeTable.SingleFrameVertical : UnicodeTable.SingleFrameBottomRightCorner );
+                }
+                for ( int i = 0; i < tabDefinition.Title.Length + 2; i++ ) {
+                    buffer.SetPixelSafe( x + 1 + i, 0, UnicodeTable.SingleFrameHorizontal );
+                    if ( tab == activeTabIndex )
+                        buffer.SetPixelSafe( x + 1 + i, 2, ' ' );
+                }
+                buffer.RenderStringSafe( " " + tabDefinition.Title + " ", x + 1, 1,
+                    activeTabIndex == tab ? attr : inactiveAttr );
+                if ( tab >= activeTabIndex ) {
+                    buffer.SetPixelSafe( x + tabDefinition.Title.Length + 3, 0, UnicodeTable.SingleFrameTopRightCorner );
+                    buffer.SetPixelSafe( x + tabDefinition.Title.Length + 3, 1, UnicodeTable.SingleFrameVertical );
+                }
+                if ( tab == activeTabIndex ) {
+                    buffer.SetPixelSafe( x + tabDefinition.Title.Length + 3, 2,
+                        activeTabIndex == tabDefinitions.Count - 1 && ActualWidth - 1 == x + tabDefinition.Title.Length + 3
+                            ? UnicodeTable.SingleFrameVertical
+                            : UnicodeTable.SingleFrameBottomLeftCorner );
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ConsoleFramework/Controls/TextBlock.cs b/ConsoleFramework/Controls/TextBlock.cs
index 6a330c4..9e25336 100644
--- a/ConsoleFramework/Controls/TextBlock.cs
+++ b/ConsoleFramework/Controls/TextBlock.cs
@@ -1,9 +1,11 @@
 using ConsoleFramework.Core;
 using ConsoleFramework.Native;
 using ConsoleFramework.Rendering;
+using Xaml;
 
 namespace ConsoleFramework.Controls
 {
+    [ContentProperty("Text")]
     public class TextBlock : Control {
         private string text;
 
@@ -14,6 +16,20 @@ public TextBlock() {
             initialize();
         }
 
+        private Color color = Color.Black;
+
+        public Color Color
+        {
+            get { return color; }
+            set
+            {
+                if ( color != value ) {
+                    color = value;
+                    Invalidate(  );
+                }
+            }
+        }
+
         public string Text {
             get {
                 return text;
@@ -33,7 +49,7 @@ protected override Size MeasureOverride(Size availableSize) {
         }
 
         public override void Render(RenderingBuffer buffer) {
-            Attr attr = Colors.Blend(Color.Black, Color.DarkYellow);
+            Attr attr = Colors.Blend(color, Color.DarkYellow);
             buffer.FillRectangle( 0, 0, ActualWidth, ActualHeight, ' ', attr);
             for (int x = 0; x < ActualWidth; ++x) {
                 for (int y = 0; y < ActualHeight; ++y) {
diff --git a/ConsoleFramework/Controls/Window.cs b/ConsoleFramework/Controls/Window.cs
index 02f9088..2e87276 100644
--- a/ConsoleFramework/Controls/Window.cs
+++ b/ConsoleFramework/Controls/Window.cs
@@ -43,8 +43,7 @@ protected virtual void initialize( ) {
         /// По клику мышки ищет конечный Focusable контрол, который размещён 
         /// на месте нажатия и устанавливает на нём фокус.
         /// </summary>
-        private void Window_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
+        private void Window_OnPreviewMouseDown(object sender, MouseButtonEventArgs e) {
             PassFocusToChildUnderPoint( e );
         }
 
diff --git a/ConsoleFramework/Core/VisualTreeHelper.cs b/ConsoleFramework/Core/VisualTreeHelper.cs
index aee5132..0b04f6c 100644
--- a/ConsoleFramework/Core/VisualTreeHelper.cs
+++ b/ConsoleFramework/Core/VisualTreeHelper.cs
@@ -85,5 +85,48 @@ public static T FindClosestParent< T >( Control control ) where T : Control {
             if (tmp is T) return (T) tmp;
             return null;
         }
+
+        /// <summary>
+        /// Находит самый верхний элемент под указателем мыши с координатами rawPoint.
+        /// Учитывается прозрачность элементов - если пиксель, куда указывает мышь, отмечен как
+        /// прозрачный для событий мыши (opacity от 4 до 7), то они будут проходить насквозь,
+        /// к следующему контролу. Также учитывается видимость элементов - Hidden и Collapsed элементы
+        /// будут проигнорированы.
+        /// Так обрабатываются, например, тени окошек и прозрачные места контролов (первый столбец Combobox).
+        /// </summary>
+        /// <param name="localPoint">Координаты относительно control</param>
+        /// <param name="control">RootElement для проверки всего визуального дерева.</param>
+        /// <returns>Элемент управления или null, если событие мыши было за границами всех контролов, или
+        /// если все контролы были прозрачны для событий мыши</returns>
+        public static Control FindTopControlUnderMouse(Control control, Point localPoint) {
+            if (null == control) throw new ArgumentNullException("control");
+
+            Point rawPoint = Control.TranslatePoint( control, localPoint, null );
+
+            if (control.Children.Count != 0) {
+                IList<Control> childrenOrderedByZIndex = control.GetChildrenOrderedByZIndex();
+                for (int i = childrenOrderedByZIndex.Count - 1; i >= 0; i--) {
+                    Control child = childrenOrderedByZIndex[i];
+                    if (Control.HitTest(rawPoint, control, child)) {
+                        Control foundSource = FindTopControlUnderMouse(child, 
+                            Control.TranslatePoint( control, localPoint, child ));
+                        if ( null != foundSource ) return foundSource;
+                    }
+                }
+            }
+            Rect controlRect = new Rect(new Point(0, 0), control.RenderSize);
+            if ( !controlRect.Contains( localPoint ) ) {
+                return null;
+            } else {
+                if ( control.Visibility != Visibility.Visible )
+                    return null;
+                int _opacity = ConsoleApplication.Instance.Renderer
+                    .getControlOpacityAt( control, localPoint.X, localPoint.Y );
+                if ( _opacity >= 4 && _opacity <= 7 ) {
+                    return null;
+                }
+            }
+            return control;
+        }
     }
 }
\ No newline at end of file
diff --git a/ConsoleFramework/Events/EventManager.cs b/ConsoleFramework/Events/EventManager.cs
index 0495e18..40202f8 100644
--- a/ConsoleFramework/Events/EventManager.cs
+++ b/ConsoleFramework/Events/EventManager.cs
@@ -248,13 +248,18 @@ public void ParseInputEvent(INPUT_RECORD inputRecord, Control rootElement) {
                     // вынуждены сохранять координаты, полученные при предыдущем событии мыши
                     rawPosition = lastMousePosition;
                 }
-                Control topMost = findSource(rawPosition, rootElement);
+
+                Control topMost = VisualTreeHelper.FindTopControlUnderMouse(rootElement,
+                    Control.TranslatePoint(null, rawPosition, rootElement));
 
                 // если мышь захвачена контролом, то события перемещения мыши доставляются только ему,
                 // события, связанные с нажатием мыши - тоже доставляются только ему, вместо того
                 // контрола, над которым событие было зарегистрировано. Такой механизм необходим,
                 // например, для корректной обработки перемещений окон (вверх или в стороны)
                 Control source = (inputCaptureStack.Count != 0) ? inputCaptureStack.Peek() : topMost;
+
+                // No sense to further process event with no source control
+                if ( source == null ) return;
                 
                 if (mouseEvent.dwEventFlags == MouseEventFlags.MOUSE_MOVED) {
                     MouseButtonState leftMouseButtonState = getLeftButtonState(mouseEvent.dwButtonState);
@@ -593,34 +598,6 @@ private bool processRoutedEvent(RoutedEvent routedEvent, RoutedEventArgs args) {
             return args.Handled;
         }
 
-        /// <summary>
-        /// Находит самый верхний элемент под указателем мыши с координатами rawPoint.
-        /// Учитывается прозрачность элементов - если пиксель, куда указывает мышь, отмечен как
-        /// прозрачный для событий мыши (opacity от 4 до 7), то они будут проходить насквозь,
-        /// к следующему контролу.
-        /// Так обрабатываются, например, тени окошек и прозрачные места контролов (первый столбец Combobox).
-        /// </summary>
-        /// <param name="rawPoint"></param>
-        /// <param name="control">RootElement для проверки всего визуального дерева.</param>
-        /// <returns></returns>
-        private Control findSource(Point rawPoint, Control control) {
-            if (control.Children.Count != 0) {
-                IList<Control> childrenOrderedByZIndex = control.GetChildrenOrderedByZIndex();
-                for (int i = childrenOrderedByZIndex.Count - 1; i >= 0; i--) {
-                    Control child = childrenOrderedByZIndex[i];
-                    if (Control.HitTest(rawPoint, control, child)) {
-                        Point childPoint = Control.TranslatePoint( null, rawPoint, child );
-                        int opacity = ConsoleApplication.Instance.Renderer.getControlOpacityAt( child, childPoint.X, childPoint.Y );
-                        if ( opacity >= 4 && opacity <= 7 ) {
-                            continue;
-                        }
-                        return findSource(rawPoint, child);
-                    }
-                }
-            }
-            return control;
-        }
-
         /// <summary>
         /// Adds specified routed event to event queue. This event will be processed in next pass.
         /// </summary>
diff --git a/ConsoleFramework/Rendering/Renderer.cs b/ConsoleFramework/Rendering/Renderer.cs
index 327e5b3..b51d2f9 100644
--- a/ConsoleFramework/Rendering/Renderer.cs
+++ b/ConsoleFramework/Rendering/Renderer.cs
@@ -508,6 +508,12 @@ private RenderingBuffer getOrCreateFullBufferForControl(Control control) {
         /// Это необходимо для определения контрола, который станет источником события мыши.
         /// </summary>
         internal int getControlOpacityAt( Control control, int x, int y ) {
+            // Если контрол, над которым водят мышью, имеет невидимых сыновей, которые ни разу
+            // не отрисовывались, то в словаре буферов для таких сыновей ничего не окажется.
+            // Возвращаем для таких детей 6 - как будто они полностью прозрачны
+            if ( !buffers.ContainsKey( control ) ) {
+                return 6;
+            }
             return buffers[ control ].GetOpacityAt( x, y );
         }
 
diff --git a/ConsoleFramework/Rendering/RenderingBuffer.cs b/ConsoleFramework/Rendering/RenderingBuffer.cs
index ee6255a..8d67181 100644
--- a/ConsoleFramework/Rendering/RenderingBuffer.cs
+++ b/ConsoleFramework/Rendering/RenderingBuffer.cs
@@ -175,6 +175,21 @@ public void ApplyChild(RenderingBuffer childBuffer, Vector actualOffset,
             }
         }
 
+        public void SetPixelSafe( int x, int y, char c ) {
+            if (buffer.GetLength( 0 ) > x && buffer.GetLength( 1 ) > y)
+                SetPixel( x, y, c );
+        }
+
+        public void SetPixelSafe(int x, int y, Attr attr) {
+            if (buffer.GetLength(0) > x && buffer.GetLength(1) > y)
+                SetPixel(x, y, attr);
+        }
+
+        public void SetPixelSafe(int x, int y, char c, Attr attr) {
+            if (buffer.GetLength(0) > x && buffer.GetLength(1) > y)
+                SetPixel(x, y, c, attr);
+        }
+
         public void SetPixel(int x, int y, char c) {
             buffer[x, y].UnicodeChar = c;
         }
@@ -285,5 +300,11 @@ public bool ContainsOpacity(Rect affectedRect) {
         public int GetOpacityAt( int x, int y ) {
             return opacityMatrix[ x, y ];
         }
+
+        public void RenderStringSafe( string s, int x, int y, Attr attr ) {
+            for ( int i = 0; i < s.Length; i++ ) {
+                SetPixelSafe( x + i, y, s[i], attr );
+            }
+        }
     }
 }
diff --git a/ConsoleFramework/Xaml/BindingMarkupExtension.cs b/ConsoleFramework/Xaml/BindingMarkupExtension.cs
index f1f081a..a409961 100644
--- a/ConsoleFramework/Xaml/BindingMarkupExtension.cs
+++ b/ConsoleFramework/Xaml/BindingMarkupExtension.cs
@@ -29,7 +29,10 @@ public BindingMarkupExtension(string path) {
 
         public object ProvideValue(IMarkupExtensionContext context) {
             Object realSource = Source ?? context.DataContext;
-            if (null != realSource && realSource is INotifyPropertyChanged) {
+            if ( null != realSource && !( realSource is INotifyPropertyChanged ) ) {
+                throw new ArgumentException("Source must be INotifyPropertyChanged to use bindings");
+            }
+            if (null != realSource) {
                 BindingMode mode = BindingMode.Default;
                 if ( Path != null ) {
                     Type enumType = typeof ( BindingMode );
diff --git a/Examples/Examples.csproj b/Examples/Examples.csproj
index 6a93438..2a8a4dc 100644
--- a/Examples/Examples.csproj
+++ b/Examples/Examples.csproj
@@ -35,7 +35,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>Examples.Program</StartupObject>
+    <StartupObject>Examples.TabControl.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -68,12 +68,17 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RadioButtons\Program.cs" />
+    <Compile Include="TabControl\Program.cs" />
     <Compile Include="TreeView\Program.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Binding\Binding.csproj">
+      <Project>{e1cd529b-e3f1-4660-aa4f-1670e0992553}</Project>
+      <Name>Binding</Name>
+    </ProjectReference>
     <ProjectReference Include="..\ConsoleFramework\ConsoleFramework.csproj">
       <Project>{2A59C284-2995-4F37-8D65-411C25C85493}</Project>
       <Name>ConsoleFramework</Name>
@@ -127,6 +132,9 @@
   <ItemGroup>
     <EmbeddedResource Include="RadioButtons\main.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TabControl\main.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Examples/MainMenu/Program.cs b/Examples/MainMenu/Program.cs
index 5bb090f..1c4fb8b 100644
--- a/Examples/MainMenu/Program.cs
+++ b/Examples/MainMenu/Program.cs
@@ -1,27 +1,50 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using ConsoleFramework;
 using ConsoleFramework.Controls;
 using ConsoleFramework.Core;
+using ConsoleFramework.Events;
 
 namespace Examples.MainMenu
 {
     class Program
     {
+        // Example of binding menu item to command
+        private sealed class DataContext : INotifyPropertyChanged
+        {
+            public DataContext( ) {
+                command = new RelayCommand(
+                    parameter => MessageBox.Show( "Information", "Command executed !", result => { } ),
+                    parameter => true );
+            }
+            
+            private readonly RelayCommand command;
+
+            public ICommand MyCommand {
+                get { return command; }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+        }
+
         public static void Main( string[ ] args ) {
             WindowsHost windowsHost = ( WindowsHost ) ConsoleApplication.LoadFromXaml( "Examples.MainMenu.windows-host.xml", null );
-            Window mainWindow = ( Window ) ConsoleApplication.LoadFromXaml( "Examples.MainMenu.main.xml", null );
+            DataContext dataContext = new DataContext(  );
+            Window mainWindow = ( Window ) ConsoleApplication.LoadFromXaml( 
+                "Examples.MainMenu.main.xml", dataContext );
             windowsHost.Show( mainWindow );
-            CheckBox checkBox = mainWindow.FindChildByName<CheckBox>("checkbox");
-            checkBox.OnClick += ( sender, eventArgs ) => {
-                eventArgs.Handled = true;
-            };
+
+            // Example of direct subscribing to Click event
             List< Control > menuItems = VisualTreeHelper.FindAllChilds( windowsHost.MainMenu, control => control is MenuItem );
             foreach ( Control menuItem in menuItems ) {
-                ( ( MenuItem ) menuItem ).Click += ( sender, eventArgs ) => {
-                    MessageBox.Show( "", "", result => {
-                        //
-                    } );
-                };
+                MenuItem item = ( ( MenuItem ) menuItem );
+                if ( item.Title == "Go" ) {
+                    item.Click += ( sender, eventArgs ) => {
+                        MessageBox.Show( "", "", result => {
+                            //
+                        } );
+                    };
+                }
             }
             ConsoleApplication.Instance.Run( windowsHost );
         }
diff --git a/Examples/MainMenu/main.xml b/Examples/MainMenu/main.xml
index 2631fde..6d3c21d 100644
--- a/Examples/MainMenu/main.xml
+++ b/Examples/MainMenu/main.xml
@@ -1,6 +1,13 @@
-<Window>
+<Window Title="Main menu and context menu example" Height="7">
+  <Window.ContextMenu>
+    <ContextMenu>
+      <MenuItem Title="Show Message" Command="{Binding MyCommand, Mode=OneWay}"/>
+      <MenuItem Title="Submenu" Type="Submenu">
+        <MenuItem Title="Show Message" Command="{Binding MyCommand, Mode=OneWay}"/>
+      </MenuItem>
+    </ContextMenu>
+  </Window.ContextMenu>
   <Panel>
-    <CheckBox Name="checkbox" Caption="Check me" Checked="True"></CheckBox>
-    <CheckBox Name="checkbox" Caption="Check me too"></CheckBox>
+    <TextBlock>Press right mouse button to open the Context Menu</TextBlock>
   </Panel>
 </Window>
\ No newline at end of file
diff --git a/Examples/Program.cs b/Examples/Program.cs
index a4649b1..304b092 100644
--- a/Examples/Program.cs
+++ b/Examples/Program.cs
@@ -187,8 +187,8 @@ private static void Main(string[] args) {
                     Title = "Очень длинное название окна",
                     Content = groupBox
                 });
-//                windowsHost.Show(window1);
-//                windowsHost.Show(createdFromXaml);
+                windowsHost.Show(window1);
+                windowsHost.Show(createdFromXaml);
                 //textBox.SetFocus(); todo : научиться задавать фокусный элемент до добавления в визуальное дерево
                 //application.TerminalSizeChanged += ( sender, eventArgs ) => {
                 //    application.CanvasSize = new Size(eventArgs.Width, eventArgs.Height);
diff --git a/Examples/TabControl/Program.cs b/Examples/TabControl/Program.cs
new file mode 100644
index 0000000..1634790
--- /dev/null
+++ b/Examples/TabControl/Program.cs
@@ -0,0 +1,15 @@
+using ConsoleFramework;
+using ConsoleFramework.Controls;
+
+namespace Examples.TabControl
+{
+    class Program
+    {
+        public static void Main( string[ ] args ) {
+            WindowsHost windowsHost = new WindowsHost( );
+            Window mainWindow = ( Window ) ConsoleApplication.LoadFromXaml( "Examples.TabControl.main.xml", null );
+            windowsHost.Show( mainWindow );
+            ConsoleApplication.Instance.Run( windowsHost );
+        }
+    }
+}
\ No newline at end of file
diff --git a/Examples/TabControl/main.xml b/Examples/TabControl/main.xml
new file mode 100644
index 0000000..9125407
--- /dev/null
+++ b/Examples/TabControl/main.xml
@@ -0,0 +1,20 @@
+<Window Title="TabControl example">
+  <TabControl HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+    <TabControl.TabDefinitions>
+      <TabDefinition Title="First"/>
+      <TabDefinition Title="Second"/>
+      <TabDefinition Title="Third"/>
+    </TabControl.TabDefinitions>
+    <CheckBox Name="checkbox" Caption="Check me" Checked="True"/>
+    <CheckBox Name="checkbox" Caption="Check me too"/>
+    <Panel>
+      <RadioGroup Name="radio">
+        <RadioButton Caption="Listen music" Checked="True"/>
+        <RadioButton Caption="Eat"/>
+        <RadioButton Caption="Read the newspaper"/>
+        <RadioButton Caption="Watch TV"/>
+      </RadioGroup>
+      <Button Caption="What am I want now?"/>
+    </Panel>
+  </TabControl>
+</Window>
\ No newline at end of file
diff --git a/Xaml/XamlParser.cs b/Xaml/XamlParser.cs
index 105aaaa..dd19367 100644
--- a/Xaml/XamlParser.cs
+++ b/Xaml/XamlParser.cs
@@ -305,7 +305,7 @@ private object createFromXaml( string xaml, object dataContext ) {
                 }
             }
 
-            // После обработки всех элементов последний раз обращаемся к
+            // После обработки всех элементов в последний раз обращаемся к
             // расширениям разметки, ожидающим свои forward-references
             processFixupTokens();
 
diff --git a/consoleframework.build b/consoleframework.build
index 54ab693..c36c6d1 100644
--- a/consoleframework.build
+++ b/consoleframework.build
@@ -128,6 +128,7 @@
         <include name="System.Core.dll"/>
 		<include name="${project.output.dir}/Xaml.dll"/>
         <include name="${project.output.dir}/ConsoleFramework.dll"/>
+        <include name="${project.output.dir}/Binding.dll"/>
       </references>
       <resources dynamicprefix="true" prefix="">
         <include name="Examples/**/*.xml" />
@@ -150,25 +151,29 @@
     <property name="exampleName" value="AsyncUiUpdate"/>
     <call target="build-examples-core"/>
 
-	<property name="entryPointClass" value="Examples.CheckBoxes.Program"/>
+    <property name="entryPointClass" value="Examples.CheckBoxes.Program"/>
     <property name="exampleName" value="CheckBoxes"/>
     <call target="build-examples-core"/>
 
-	<property name="entryPointClass" value="Examples.Commands.Program"/>
+    <property name="entryPointClass" value="Examples.Commands.Program"/>
     <property name="exampleName" value="Commands"/>
     <call target="build-examples-core"/>
 
-	<property name="entryPointClass" value="Examples.MainMenu.Program"/>
+    <property name="entryPointClass" value="Examples.MainMenu.Program"/>
     <property name="exampleName" value="MainMenu"/>
     <call target="build-examples-core"/>
 
-	<property name="entryPointClass" value="Examples.TreeView.Program"/>
+    <property name="entryPointClass" value="Examples.TreeView.Program"/>
     <property name="exampleName" value="TreeView"/>
     <call target="build-examples-core"/>
 
-	<property name="entryPointClass" value="Examples.RadioButtons.Program"/>
+    <property name="entryPointClass" value="Examples.RadioButtons.Program"/>
     <property name="exampleName" value="RadioButtons"/>
     <call target="build-examples-core"/>
+    
+    <property name="entryPointClass" value="Examples.TabControl.Program"/>
+    <property name="exampleName" value="TabControl"/>
+    <call target="build-examples-core"/>
   </target>
 
   <target name="clean">
diff --git a/native/libtermkey-0.17-x86-bin.zip b/native/libtermkey-0.17-x86-bin.zip
deleted file mode 100644
index bcacde6..0000000
Binary files a/native/libtermkey-0.17-x86-bin.zip and /dev/null differ
diff --git a/native/libtermkey-0.17-x86_64-bin.zip b/native/libtermkey-0.17-x86_64-bin.zip
deleted file mode 100644
index c6d58b3..0000000
Binary files a/native/libtermkey-0.17-x86_64-bin.zip and /dev/null differ
diff --git a/native/libtermkey-0.17.tar.gz b/native/libtermkey-0.17.tar.gz
deleted file mode 100644
index 838b710..0000000
Binary files a/native/libtermkey-0.17.tar.gz and /dev/null differ
diff --git a/native/libtermkey-0.18-x86-bin.zip b/native/libtermkey-0.18-x86-bin.zip
new file mode 100644
index 0000000..3f1ff33
Binary files /dev/null and b/native/libtermkey-0.18-x86-bin.zip differ
diff --git a/native/libtermkey-0.18-x86_64.zip b/native/libtermkey-0.18-x86_64.zip
new file mode 100644
index 0000000..a99d8dd
Binary files /dev/null and b/native/libtermkey-0.18-x86_64.zip differ
diff --git a/native/libtermkey-0.18.tar.gz b/native/libtermkey-0.18.tar.gz
new file mode 100644
index 0000000..8167c06
Binary files /dev/null and b/native/libtermkey-0.18.tar.gz differ
diff --git a/native/osx-10.8-all-bin.zip b/native/osx-10.8-all-bin.zip
index 97e9d3a..860e1e6 100644
Binary files a/native/osx-10.8-all-bin.zip and b/native/osx-10.8-all-bin.zip differ