diff --git a/parso/grammar.py b/parso/grammar.py
index c825b55..6c13f00 100644
--- a/parso/grammar.py
+++ b/parso/grammar.py
@@ -20,7 +20,7 @@ class Grammar(object):
     """
     :py:func:`parso.load_grammar` returns instances of this class.
 
-    Creating custom grammars by calling this is not supported, yet.
+    Creating custom none-python grammars by calling this is not supported, yet.
     """
     #:param text: A BNF representation of your grammar.
     _error_normalizer_config = None
@@ -219,12 +219,13 @@ def load_grammar(**kwargs):
     version.
 
     :param str version: A python version string, e.g. ``version='3.3'``.
+    :param str path: A path to a grammar file
     """
-    def load_grammar(language='python', version=None):
+    def load_grammar(language='python', version=None, path=None):
         if language == 'python':
             version_info = parse_version_string(version)
 
-            file = os.path.join(
+            file = path or os.path.join(
                 'python',
                 'grammar%s%s.txt' % (version_info.major, version_info.minor)
             )
diff --git a/parso/python/tokenize.py b/parso/python/tokenize.py
index c1f90aa..0ac8a8d 100644
--- a/parso/python/tokenize.py
+++ b/parso/python/tokenize.py
@@ -246,7 +246,7 @@ class PythonToken(Token):
         return tok_name[self.type]
 
     def __repr__(self):
-        return ('TokenInfo(type=%s, string=%r, start=%r, prefix=%r)' %
+        return ('TokenInfo(type=%s, string=%r, start_pos=%r, prefix=%r)' %
                 self._replace(type=self._get_type_name()))