diff --git a/after/syntax/python.vim b/after/syntax/python.vim
index 0523130..31d35b3 100644
--- a/after/syntax/python.vim
+++ b/after/syntax/python.vim
@@ -16,4 +16,7 @@ if g:jedi#show_function_definition == 1 && has('conceal')
   hi def link jediSpace Normal
   hi jediFat term=bold,underline cterm=bold,underline gui=bold,underline ctermbg=0 guibg=Grey
   hi jediFunction term=NONE cterm=NONE ctermfg=6 guifg=Cyan gui=NONE ctermbg=0 guibg=Grey
+
+  " override defaults
+  syn match pythonComment "#.*$" contains=pythonTodo,@Spell,jediFunction
 endif
diff --git a/jedi b/jedi
index 7e39a7d..9cb9e53 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit 7e39a7d1ba41396fb2a08657a22c1e43a8c042d6
+Subproject commit 9cb9e539227d5d69fc197e1e849522b001de7864