diff --git a/embedly/__init__.py b/embedly/__init__.py
index b94f7ab..d0161a8 100644
--- a/embedly/__init__.py
+++ b/embedly/__init__.py
@@ -1,2 +1,4 @@
 from __future__ import absolute_import
-from .client import Embedly, __version__
+from .client import Embedly
+
+__version__ = '0.4.3'
diff --git a/embedly/client.py b/embedly/client.py
index fbbbb8b..9ad81f8 100644
--- a/embedly/client.py
+++ b/embedly/client.py
@@ -17,8 +17,9 @@
 from .models import Url
 
 
-__version__ = '0.4.3'
-USER_AGENT = 'Mozilla/5.0 (compatible; embedly-python/%s;)' % __version__
+def get_user_agent():
+    from . import __version__
+    return 'Mozilla/5.0 (compatible; embedly-python/%s;)' % __version__
 
 
 class Embedly(object):
@@ -26,22 +27,24 @@ class Embedly(object):
     Client
 
     """
-    def __init__(self, key=None, user_agent=USER_AGENT, timeout=60):
+    def __init__(self, key=None, user_agent=None, timeout=60):
         """
         Initialize the Embedly client
 
-        :param user_agent: User Agent passed to Embedly
-        :type user_agent: str
         :param key: Embedly Pro key
         :type key: str
+        :param user_agent: User Agent passed to Embedly
+        :type user_agent: str
+        :param timeout: timeout for HTTP connection attempts
+        :type timeout: int
 
         :returns: None
         """
-        self.user_agent = user_agent
-        self.timeout = timeout
         self.key = key
-        self.services = []
+        self.user_agent = user_agent or get_user_agent()
+        self.timeout = timeout
 
+        self.services = []
         self._regex = None
 
     def get_services(self):
diff --git a/setup.py b/setup.py
index 1155c04..b0db388 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,11 @@
 if sys.version_info[:2] < (2, 6):
     required.append('simplejson')
 
-version = __import__('embedly').__version__
+def get_version():
+    with open(os.path.join('embedly', '__init__.py')) as f:
+        for line in f:
+            if line.startswith('__version__ ='):
+                return line.split('=')[1].strip().strip('"\'')
 
 if os.path.exists("README.rst"):
     long_description = codecs.open("README.rst", "r", "utf-8").read()
@@ -20,7 +24,7 @@
 
 setup(
     name='Embedly',
-    version=version,
+    version=get_version(),
     author='Embed.ly, Inc.',
     author_email='support@embed.ly',
     description='Python Library for Embedly',