diff --git a/pyhgvs/__init__.py b/pyhgvs/__init__.py
index c9b2c1b..663c154 100644
--- a/pyhgvs/__init__.py
+++ b/pyhgvs/__init__.py
@@ -170,12 +170,12 @@ class HGVSRegex(object):
                            for regex in CDNA_ALLELE]
 
     # Peptide syntax
-    PEP = "([A-Z]([a-z]{2}))+"
+    PEP = "(([A-Z]([a-z]{2}))|([GAVLIMFWPSTCYNQDEKRH\*]))+"
     PEP_REF = "(?P<ref>" + PEP + ")"
     PEP_REF2 = "(?P<ref2>" + PEP + ")"
     PEP_ALT = "(?P<alt>" + PEP + ")"
 
-    PEP_EXTRA = "(?P<extra>(|=|\?)(|fs))"
+    PEP_EXTRA = "(?P<extra>(|=|\?)(|fs((Ter|\*)\d+)?))"
 
     # Peptide allele syntax
     PEP_ALLELE = [
diff --git a/setup.py b/setup.py
index ace27d1..3ca2cef 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,12 @@
 #!/usr/bin/env python
 
 from setuptools import setup
-from pip.req import parse_requirements
-from pip.download import PipSession
+try:  # pip 9 or earlier
+    from pip.req import parse_requirements
+    from pip.download import PipSession
+except ImportError:  # pip 10 or later
+    from pip._internal.req import parse_requirements
+    from pip._internal.download import PipSession
 import sys
 
 description = ("This library provides a simple to use Python API for parsing, "