diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index bb136e8ae..0024e64a2 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,10 +1,15 @@
+1.70 (2013-02-22):
   Fixed issue MR-183 - Error trying to save connections when using SQL - Invalid column name _parentConstantId
   Fixed issue MR-225 - Tabs do not open in a panel until multiple panels are displayed.
+  Fixed issue MR-229 - Integrated PuTTY doesn't work in Windows 8 RP
+  Fixed issue MR-264 - Windows 8 support
   Fixed issue MR-317 - Difficulty right-clicking on Tab
   Fixed issue MR-318 - Wrong tab gets selected when tab names overflow on the tab bar
   Fixed issue MR-321 - New connection panel doesn't get panel header if its the only one or is moved
-  Added option to always show panel tabs
+  Fixed issue MR-322 - Connection Button not listing servers
+  Added option to always show panel tabs.
   Fixed "Decryption failed. Padding is invalid and cannot be removed." notification.
+  Fixed KiTTY opening in a separate window when using a saved session.
 
 1.70 Beta 2 (2013-02-18):
   Fixed issue MR-47 - Silent Installation Prompts for Language
diff --git a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
index 6d37da5ce..fc2a711de 100644
--- a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
@@ -156,13 +156,14 @@ Namespace Connection
                     AddHandler PuttyProcess.Exited, AddressOf ProcessExited
 
                     PuttyProcess.Start()
-                    PuttyProcess.WaitForInputIdle()
+                    PuttyProcess.WaitForInputIdle(My.Settings.MaxPuttyWaitTime * 1000)
 
                     Dim startTicks As Integer = Environment.TickCount
                     While PuttyHandle.ToInt32 = 0 And Environment.TickCount < startTicks + (My.Settings.MaxPuttyWaitTime * 1000)
                         If _isPuttyNg Then
                             PuttyHandle = FindWindowEx(InterfaceControl.Handle, 0, vbNullString, vbNullString)
                         Else
+                            PuttyProcess.Refresh()
                             PuttyHandle = PuttyProcess.MainWindowHandle
                         End If
                         If PuttyHandle.ToInt32 = 0 Then Thread.Sleep(0)
@@ -265,6 +266,9 @@ Namespace Connection
             End Function
 
             Public Shared Function IsFilePuttyNg(file As String) As Boolean
+                ' PuTTYNG enhancements are not yet compatible with Windows 8
+                If Environment.OSVersion.Version.CompareTo(New Version(6, 2)) >= 0 Then Return False
+
                 Dim isPuttyNg As Boolean
                 Try
                     isPuttyNg = FileVersionInfo.GetVersionInfo(file).InternalName.Contains("PuTTYNG")
diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb
index 9a9c0f397..33a1300ef 100644
--- a/mRemoteV1/Forms/frmMain.vb
+++ b/mRemoteV1/Forms/frmMain.vb
@@ -685,8 +685,6 @@ Public Class frmMain
                 End If
 
                 AddHandler tMenItem.MouseDown, AddressOf ConMenItem_MouseDown
-
-                tMenItem.Dispose()
             Next
         Catch ex As Exception
             MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True)