diff --git a/README.md b/README.md
index 01590aa..98dadad 100644
--- a/README.md
+++ b/README.md
@@ -35,3 +35,8 @@ default. You would have to use `:TableModeToggle` command or the table mode
 toggle mapping, which is `<Leader>tm` by default. This is on a per buffer basis
 and so it does not mess up unless enabled explicitly. Please read `:h table-mode`
 for further information.
+
+Demo:
+
+<img src="https://raw.github.com/dhruvasagar/vim-table-mode/master/demo.gif"
+height="500" />
diff --git a/demo.gif b/demo.gif
new file mode 100644
index 0000000..af85131
Binary files /dev/null and b/demo.gif differ
diff --git a/doc/table-mode.txt b/doc/table-mode.txt
index 7a653b1..375096b 100644
--- a/doc/table-mode.txt
+++ b/doc/table-mode.txt
@@ -89,11 +89,12 @@ g:table_mode_always_active			*table-mode-options-always-active*
 	Use this option to permanently enable the table mode: >
 		let g:table_mode_always_active = 0
 <
-	This will trigger table creation once you type |table-mode-separator|
-	as long as it's the first character on the line, which can be
-	annoying. That's why I would recommend you to instead use
-	|table-mode-mappings-toggle| to enable / disable toggle mode when
-	needed.
+	This will trigger table creation once you type the
+	|table-mode-options-separator| as long as it's the first character on
+	the line, which can be annoying. I recommend you to instead use the
+	|table-mode-mappings-toggle| or |table-mode-commands-toggle| to toggle
+	the table mode or |table-mode-commands-enable| to enable and
+	|table-mode-commands-disable| to disable mode when needed.
 
 ===============================================================================
 MAPPINGS						*table-mode-mappings*
@@ -101,7 +102,7 @@ MAPPINGS						*table-mode-mappings*
 						*table-mode-mappings-toggle*
 <Leader>tm	Enable table mode for the current buffer. You can change this
 		using the |toggle-mode-options-toggle-map| option. This is
-		applicable only if |table-mode-always-active| is not set.
+		applicable only if |table-mode-options-always-active| is not set.
 
 						*table-mode-mappings-trigger*
 |		Trigger table creation in table mode. You can change this
diff --git a/doc/tags b/doc/tags
index 74fa2ad..e7fb4f7 100644
--- a/doc/tags
+++ b/doc/tags
@@ -1,4 +1,6 @@
 table-mode-commands	table-mode.txt	/*table-mode-commands*
+table-mode-commands-disable	table-mode.txt	/*table-mode-commands-disable*
+table-mode-commands-enable	table-mode.txt	/*table-mode-commands-enable*
 table-mode-commands-toggle	table-mode.txt	/*table-mode-commands-toggle*
 table-mode-contents	table-mode.txt	/*table-mode-contents*
 table-mode-contributing	table-mode.txt	/*table-mode-contributing*