diff --git a/README.md b/README.md
index fd112e7..7c0f1fa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# VIM Table Mode v4.6.5 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
+# VIM Table Mode v4.6.6 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
 
 An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
diff --git a/autoload/tablemode.vim b/autoload/tablemode.vim
index b03e142..8d65e5c 100644
--- a/autoload/tablemode.vim
+++ b/autoload/tablemode.vim
@@ -105,11 +105,21 @@ function! s:ToggleAutoAlign() "{{{2
   endif
 endfunction
 
+function! s:ToggleOptions() "{{{2
+  if tablemode#IsActive()
+    let b:old_update_time = &updatetime
+    setl updatetime = g:table_mode_update_time
+  else
+    exec 'set updatetime='.get(b:, 'old_update_time', 4000)
+  endif
+endfunction
+
 function! s:SetActive(bool) "{{{2
   let b:table_mode_active = a:bool
   call s:ToggleSyntax()
   call s:ToggleMapping()
   call s:ToggleAutoAlign()
+  call s:ToggleOptions()
   if tablemode#IsActive()
     doautocmd User TableModeEnabled
   else
diff --git a/doc/table-mode.txt b/doc/table-mode.txt
index 3dda5de..1023dc1 100644
--- a/doc/table-mode.txt
+++ b/doc/table-mode.txt
@@ -1,7 +1,7 @@
 *table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-                               VERSION 4.6.5
+                               VERSION 4.6.6
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -310,6 +310,12 @@ g:table_mode_auto_align                                *table-mode-auto-align*
                 let g:table_mode_auto_align = 1
 <
 
+g:table_mode_update_time                              *table-mode-update-time*
+        Set the value of updatetime to be used when table mode is active,
+        used in combination with |table-mode-auto-align|. >
+                let g:table_mode_update_time = 500
+<
+
 ===============================================================================
 MAPPINGS						*table-mode-mappings*
 
diff --git a/plugin/table-mode.vim b/plugin/table-mode.vim
index 1c779a8..1ae21df 100644
--- a/plugin/table-mode.vim
+++ b/plugin/table-mode.vim
@@ -46,6 +46,7 @@ call s:SetGlobalOptDefault('table_mode_sort_map', '<Leader>ts')
 
 call s:SetGlobalOptDefault('table_mode_syntax', 1)
 call s:SetGlobalOptDefault('table_mode_auto_align', 1)
+call s:SetGlobalOptDefault('table_mode_update_time', 500)
 
 function! s:TableEchoCell() "{{{1
   if tablemode#table#IsRow('.')