diff --git a/.gitignore b/.gitignore
index e2dd018..088ea98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,6 @@ tags
 *.iobj
 *.ipdb
 *.user
-*.zip
\ No newline at end of file
+*.zip
+bin/*
+bin64/*
diff --git a/QuickText.cpp b/QuickText.cpp
index 2ea807c..45fa2a5 100644
--- a/QuickText.cpp
+++ b/QuickText.cpp
@@ -607,6 +607,8 @@ void QuickText()
         SendMessage( scintilla, SCI_REPLACESEL, 0,
                      ( LPARAM )cQuickText.text.c_str() );
 
+        SendMessage( scintilla, SCI_AUTOCCANCEL, 0, 0 );
+
         cQuickText.editing = true;
 
         cQuickText.cHotSpot = NEW_HOTSPOT;
@@ -1045,20 +1047,22 @@ bool restoreKeyStroke( int cursorPos, HWND &scintilla )
     CHAR buf[101];    // Because N++ allows 99 as max tab-to-space conversion
     if ( sk._key == VK_TAB )
     {
-        bool useTabs = ::SendMessage( scintilla, SCI_GETUSETABS, 0, 0 );
-        if ( useTabs )
-        {
-            sprintf( buf, "%c", sk._key );
-            ::SendMessage( scintilla, SCI_REPLACESEL, cursorPos, ( LPARAM )buf );
-        }
-        else
-        {
-            int tabSpace = ::SendMessage( scintilla, SCI_GETTABWIDTH, 0, 0 );
-            for (int i = 0; ((i < tabSpace) && (i<100)); i++)
-                buf[i] = ' ';
-            buf[tabSpace] = '\0';
-            ::SendMessage( scintilla, SCI_REPLACESEL, cursorPos, ( LPARAM )buf );
-        }
+        SendMessage( scintilla, SCI_TAB, 0, 0 );
+
+        // bool useTabs = ::SendMessage( scintilla, SCI_GETUSETABS, 0, 0 );
+        // if ( useTabs )
+        // {
+            // sprintf( buf, "%c", sk._key );
+            // ::SendMessage( scintilla, SCI_REPLACESEL, cursorPos, ( LPARAM )buf );
+        // }
+        // else
+        // {
+            // int tabSpace = ( int )::SendMessage( scintilla, SCI_GETTABWIDTH, 0, 0 );
+            // for (int i = 0; ((i < tabSpace) && (i<100)); i++)
+                // buf[i] = ' ';
+            // buf[tabSpace] = '\0';
+            // ::SendMessage( scintilla, SCI_REPLACESEL, cursorPos, ( LPARAM )buf );
+        // }
     }
     else
     {
diff --git a/QuickText.rc b/QuickText.rc
index 8b67125..fe39131 100644
--- a/QuickText.rc
+++ b/QuickText.rc
@@ -32,10 +32,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,1,1
- PRODUCTVERSION 0,1,1,1
+ FILEVERSION 0,1,2,1
+ PRODUCTVERSION 0,1,2,1
  FILEFLAGSMASK 0x17L
-#define VER_STRING  "0.1.1.1"
+#define VER_STRING  "0.1.2.1"
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
diff --git a/bin/QuickText.dll b/bin/QuickText.dll
deleted file mode 100644
index 5c0d6c8..0000000
Binary files a/bin/QuickText.dll and /dev/null differ
diff --git a/bin64/QuickText.dll b/bin64/QuickText.dll
deleted file mode 100644
index dd19a45..0000000
Binary files a/bin64/QuickText.dll and /dev/null differ