diff --git a/jedi/parser/__init__.py b/jedi/parser/__init__.py
index 8c43e574..80231a46 100644
--- a/jedi/parser/__init__.py
+++ b/jedi/parser/__init__.py
@@ -49,6 +49,7 @@ class Parser(object):
 
         if not source.endswith('\n'):
             source += '\n'
+        self.global_names = []
         #if self.options["print_function"]:
         #    python_grammar = pygram.python_grammar_no_print_statement
         #else:
@@ -56,10 +57,16 @@ class Parser(object):
         # files processed even if they were not changed during refactoring. If
         # and only if the refactor method's write parameter was True.
         logger = logging.getLogger("RefactoringTool")
-        d = Driver(pytree.python_grammar, convert=pytree.convert, logger=logger)
+        d = Driver(pytree.python_grammar, convert=self.convert, logger=logger)
         print(repr(source))
         self.module = d.parse_string(source).get_parent_until()
 
+    def convert(self, grammar, raw_node):
+        new_node = pytree.convert(grammar, raw_node)
+        if isinstance(new_node, pr.GlobalStmt):
+            self.global_names += new_node.names()
+        return new_node
+
     def __init__old__(self, source, module_path=None, no_docstr=False,
                       tokenizer=None, top_module=None):
         self.no_docstr = no_docstr
diff --git a/jedi/parser/pytree.py b/jedi/parser/pytree.py
index 2db96318..1f31ed37 100644
--- a/jedi/parser/pytree.py
+++ b/jedi/parser/pytree.py
@@ -81,7 +81,7 @@ def convert(grammar, raw_node):
         'yield_stmt': pr.KeywordStatement,
         'del_stmt': pr.KeywordStatement,
         'pass_stmt': pr.KeywordStatement,
-        'global_stmt': pr.KeywordStatement,
+        'global_stmt': pr.GlobalStmt,
         'nonlocal_stmt': pr.KeywordStatement,
         'assert_stmt': pr.KeywordStatement,
     }
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index 352ed2f0..7cf40660 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -964,6 +964,11 @@ class KeywordStatement(Simple):
         return self.children[0].value
 
 
+class GlobalStmt(Simple):
+    def names(self):
+        return self.children[1::2]
+
+
 class Statement(Simple, DocstringMixin):
     """
     This is the class for all the possible statements. Which means, this class