diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5dcedd4..10c5140 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.6
+current_version = 0.9.7
 files = SQLTools.py
 tag = True
 commit = True
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 9f24d4b..7f216c3 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,23 +1,30 @@
-> This is a guideline to help us to understand SQLTools Issues. 
+> This issue template helps us understand your SQLTools issues better. 
+>
+> You don't need to stick to this template, but please try to guide us to reproduce the errors or understand your feature requests. 
 > 
-> You don't need to stick to this, but please try to guide us to reproduce the errors or understand your feature requests.
+> Before submitting an issue, please consider these things first: 
+> * Are you running the latest version? If not, try to upgrade.
+> * Did you check the [Setup Guide](http://mtxr.github.io/SQLTools/)?
+> * Did you check the logs in console (``Ctrl+` `` or select *View → Show Console*)?
 
 ### Issue Type
 
-* [ ] Feature Request
-* [ ] Bugfix/Errors
-* [ ] Questions
-* [ ] Other
+Feature Request |
+Bug/Error |
+Question |
+Other
 
-### Prerequisites (For bugfixes)
+### Description
 
-* [ ] Are you running the latest version?
-* [ ] Did you check the logs?
-* [ ] Did you check the Setup?
+[Description of the bug / feature / question]
 
-### Description
+### Version
+
+- *SQLTools Version*: vX.Y.Z
+- *OS*: (Windows, Mac, Linux)
+- *RDBMS*: (MySQL, PostgreSQL, Oracle, MSSQL, SQLite, Vertica, ...)
 
-[Description of the bug or feature]
+> You can get this information by executing `ST: About` from Sublime `Command Palette`.
 
 ### Steps to Reproduce (For bugfixes)
 
@@ -28,11 +35,3 @@
 **Expected behavior:** [What you expected to happen]
 
 **Actual behavior:** [What actually happened]
-
-### Versions
-
-- *Version*: vX.Y.Z
-- *OS*: ...
-- *RDBMS*: (MySQL, PostgreSQL, Oracle, MSSQL, SQLite, Vertica, ...)
-
-You can get this information from executing `ST: About` from Sublime `Command Palette`.
diff --git a/SQLTools.py b/SQLTools.py
index 45bf772..152c35e 100644
--- a/SQLTools.py
+++ b/SQLTools.py
@@ -1,4 +1,4 @@
-__version__ = "v0.9.6"
+__version__ = "v0.9.7"
 
 import sys
 import os
diff --git a/messages.json b/messages.json
index 195d7e6..20f4834 100644
--- a/messages.json
+++ b/messages.json
@@ -11,5 +11,6 @@
     "0.9.3": "messages/v0.9.3.md",
     "0.9.4": "messages/v0.9.4.md",
     "0.9.5": "messages/v0.9.5.md",
-    "0.9.6": "messages/v0.9.6.md"
+    "0.9.6": "messages/v0.9.6.md",
+    "0.9.7": "messages/v0.9.7.md"
 }
diff --git a/messages/v0.9.7.md b/messages/v0.9.7.md
new file mode 100644
index 0000000..f38adb4
--- /dev/null
+++ b/messages/v0.9.7.md
@@ -0,0 +1,5 @@
+## v0.9.7 Notes
+
+### Fixes
+
+* Completions not working with identifiers containing $ symbol [#152]