diff --git a/pyfav/__init__.py b/pyfav/__init__.py
index 9b46210..31d4a9c 100644
--- a/pyfav/__init__.py
+++ b/pyfav/__init__.py
@@ -1,3 +1,8 @@
-from pyfav import get_favicon_url
-from pyfav import parse_markup_for_favicon
-from pyfav import download_favicon
\ No newline at end of file
+try:
+  from pyfav import get_favicon_url
+  from pyfav import parse_markup_for_favicon
+  from pyfav import download_favicon
+except:
+  from pyfav.pyfav import get_favicon_url
+  from pyfav.pyfav import parse_markup_for_favicon
+  from pyfav.pyfav import download_favicon
diff --git a/pyfav/pyfav.py b/pyfav/pyfav.py
index 1d6a291..2761130 100644
--- a/pyfav/pyfav.py
+++ b/pyfav/pyfav.py
@@ -34,7 +34,10 @@
 
 
 import urllib, os.path, string
-from urlparse import urlparse
+try:
+  from urlparse import urlparse
+except:
+  from urllib.parse import urlparse
 import requests
 from bs4 import BeautifulSoup
 
@@ -189,4 +192,4 @@ def get_favicon_url(url):
         return favicon_url
 
     # No favicon in the markup or at url/favicon.ico
-    return None
\ No newline at end of file
+    return None
diff --git a/setup.py b/setup.py
index 42e780b..7d51a95 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
 
 setup( 
     name = 'pyfav',
-    version = '0.1',
+    version = '0.2',
     url = 'http://github.com/phillipsm/pyfav',
     author = 'Matthew Phillips',
     author_email = 'matt@mattphillips.info',
@@ -36,4 +36,4 @@
     classifiers = filter(None, classifiers.split('\n')),
     keywords = ['favicon', 'favicons'],
     test_suite = 'test',
-)
\ No newline at end of file
+)