diff --git a/TODO b/TODO
index 75deba1e..73ac7f30 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 # vi: ft=vimwiki
-* [ ] Separate the column completions to be table specific.
+* [o] Separate the column completions to be table specific. (SELECT, INSERT, UPDATE)
+* [ ] Column completion for nested sql.
 * [ ] Add JOIN to the list of keywords and provide proper autocompletion for it. 
 * [ ] Use a pager to display the output. (Check Click's document).
 * [ ] Improve the smart completion for Insert statement. (Needs table specific columns)
diff --git a/release.py b/release.py
index 4f49cd07..2417978b 100644
--- a/release.py
+++ b/release.py
@@ -2,6 +2,7 @@
 import re
 import ast
 import subprocess
+import sys
 
 DEBUG = False
 
@@ -45,6 +46,10 @@ if __name__ == '__main__':
         subprocess.check_output = lambda x: x
 
     ver = version('pgcli/__init__.py')
+    print ('Releasing Version:', ver)
+    choice = raw_input('Are you sure? (Y/N)')
+    if choice.lower() != 'y':
+        sys.exit(1)
     commit_for_release('pgcli/__init__.py', ver)
     create_git_tag('v%s' % ver)
     register_with_pypi()