diff --git a/safaribooks.py b/safaribooks.py
index e4ba5e9..b9ea8a1 100755
--- a/safaribooks.py
+++ b/safaribooks.py
@@ -32,8 +32,8 @@
 PROFILE_URL = SAFARI_BASE_URL + "/profile/"
 
 # DEBUG
-USE_PROXY = False
-PROXIES = {"https": "https://127.0.0.1:8080"}
+USE_PROXY = True
+PROXIES = {"https": "http://de001-surf.zone2.proxy.allianz:8080"}
 
 
 class Display:
@@ -317,7 +317,7 @@ def __init__(self, args):
         self.session = requests.Session()
         if USE_PROXY:  # DEBUG
             self.session.proxies = PROXIES
-            self.session.verify = False
+            self.session.verify = True
 
         self.session.headers.update(self.HEADERS)
 
@@ -1110,7 +1110,14 @@ def create_epub(self):
             arguments.error("invalid option: `--no-cookies` is valid only if you use the `--cred` option")
 
     if len(args_parsed.bookid) > 0:
-        bookID = args_parsed.bookid.split("/")[-1]          # Only get book ID from URL
+        bookid_regex = r"['\"]*http[s]?://[a-zA-Z0-9.\-/]+(\d{10,15})/*['\"]*"          # Matches book URL
+        pattern = re.compile(bookid_regex)
+        match = re.search(pattern, args_parsed.bookid)
+        if match:
+            bookID = match.group(1)
+        else:
+            bookID = None
+            arguments.error("Invalid book ID or URL")
         if str.isdecimal(bookID):
             args_parsed.bookid = bookID
         else: