diff --git a/Changelog.md b/Changelog.md
index 0378115..d0094d8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,4 +19,5 @@
 - Fix for special characters and #15 [2017.07.05]
 - Episode Download Range supprt Added [2017.07.07]
 - Added support to include fonts in the muxed videos [2017.07.09]
-- Changed mkvmerge.exe to mkvmerge to support Non-Windows Operating Systems [2017.07.24]
\ No newline at end of file
+- Changed mkvmerge.exe to mkvmerge to support Non-Windows Operating Systems [2017.07.24]
+- Fix for #21 and #22 [2017.10.04]
\ No newline at end of file
diff --git a/anime_dl/sites/crunchyroll.py b/anime_dl/sites/crunchyroll.py
index 0c39568..a306a12 100644
--- a/anime_dl/sites/crunchyroll.py
+++ b/anime_dl/sites/crunchyroll.py
@@ -360,11 +360,11 @@ class CrunchyRoll(object):
         dub_list = []
         ep_sub_list = []
         for episode_link, episode_type in re.findall(
-                r'\<a href\=\"\/(.*?)\"\ title\=\"(.*?)\"\ class\=\"portrait\-element\ block\-link', str(page_source)):
+                r'\<a href\=\"\/(.*?)\"\ title\=\"(.*?)', str(page_source)):
             if "(Dub)" in str(episode_type):
-                dub_list.append(str(url) + str(episode_link))
+                dub_list.append(str(url) + "/" + str(str(episode_link).split("/")[-1]))
             else:
-                ep_sub_list.append(str(url) + str(episode_link))
+                ep_sub_list.append(str(url) + "/" + str(str(episode_link).split("/")[-1]))
 
         if len(dub_list) == 0 and len(ep_sub_list) == 0:
             print("Could not find the show links. Report on https://github.com/Xonshiz/anime-dl/issues/new")
diff --git a/anime_dl/version.py b/anime_dl/version.py
index 6c0e8cb..8190ae8 100644
--- a/anime_dl/version.py
+++ b/anime_dl/version.py
@@ -1,2 +1,2 @@
 # Format : YY/MM/DD
-__version__ = "2017.07.24"
+__version__ = "2017.10.04"
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 0378115..d0094d8 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -19,4 +19,5 @@
 - Fix for special characters and #15 [2017.07.05]
 - Episode Download Range supprt Added [2017.07.07]
 - Added support to include fonts in the muxed videos [2017.07.09]
-- Changed mkvmerge.exe to mkvmerge to support Non-Windows Operating Systems [2017.07.24]
\ No newline at end of file
+- Changed mkvmerge.exe to mkvmerge to support Non-Windows Operating Systems [2017.07.24]
+- Fix for #21 and #22 [2017.10.04]
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 09426d5..8cb0ad0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,4 @@
 argparse
 cfscrape
+bs4
+tqdm