diff --git a/__init__.py b/__init__.py
index 8829c09..73b19e2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1 +1 @@
-import twython2k as twython
+import twython as twython
diff --git a/build/lib/twython.py b/build/lib/twython.py
index ea0ec31..456b6c8 100644
--- a/build/lib/twython.py
+++ b/build/lib/twython.py
@@ -18,7 +18,7 @@ from urlparse import urlparse
 from urllib2 import HTTPError
 
 __author__ = "Ryan McGrath <ryan@venodesigns.net>"
-__version__ = "0.5"
+__version__ = "0.6"
 
 """Twython - Easy Twitter utilities in Python"""
 
@@ -60,7 +60,6 @@ class setup:
 		self.access_token_url = 'https://twitter.com/oauth/access_token'
 		self.authorization_url = 'http://twitter.com/oauth/authorize'
 		self.signin_url = 'http://twitter.com/oauth/authenticate'
-		self.signature_method = oauth.OAuthSignatureMethod_HMAC_SHA1()
 		self.consumer_key = consumer_key
 		self.consumer_secret = consumer_secret
 		self.request_token = None
@@ -81,6 +80,7 @@ class setup:
 				except HTTPError, e:
 					raise TangoError("Authentication failed with your provided credentials. Try again? (%s failure)" % `e.code`, e.code)
 			else:
+				self.signature_method = oauth.OAuthSignatureMethod_HMAC_SHA1()
 				# Awesome OAuth authentication ritual
 				if consumer_secret is not None and consumer_key is not None:
 					#req = oauth.OAuthRequest.from_consumer_and_token
diff --git a/dist/twython-0.5-py2.5.egg b/dist/twython-0.5-py2.5.egg
index 9911338..8b24628 100644
Binary files a/dist/twython-0.5-py2.5.egg and b/dist/twython-0.5-py2.5.egg differ
diff --git a/dist/twython-0.6-py2.5.egg b/dist/twython-0.6-py2.5.egg
new file mode 100644
index 0000000..64d9ac7
Binary files /dev/null and b/dist/twython-0.6-py2.5.egg differ
diff --git a/dist/twython-0.6.tar.gz b/dist/twython-0.6.tar.gz
new file mode 100644
index 0000000..e2e40b4
Binary files /dev/null and b/dist/twython-0.6.tar.gz differ
diff --git a/dist/twython-0.6.win32.exe b/dist/twython-0.6.win32.exe
new file mode 100644
index 0000000..2a43765
Binary files /dev/null and b/dist/twython-0.6.win32.exe differ
diff --git a/setup.py b/setup.py
index 3a8516d..038ab6a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 import sys, os
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '0.5'
+__version__ = '0.6'
 
 # For the love of god, use Pip to install this.
 
@@ -11,7 +11,7 @@ __version__ = '0.5'
 METADATA = dict(
 	name = "twython",
 	version = __version__,
-	py_modules = ['twython2k'],
+	py_modules = ['twython'],
 	author='Ryan McGrath',
 	author_email='ryan@venodesigns.net',
 	description='A new and easy way to access Twitter data with Python.',
diff --git a/twython.egg-info/PKG-INFO b/twython.egg-info/PKG-INFO
index 11e1b16..9d7210c 100644
--- a/twython.egg-info/PKG-INFO
+++ b/twython.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: twython
-Version: 0.5
+Version: 0.6
 Summary: A new and easy way to access Twitter data with Python.
 Home-page: http://github.com/ryanmcgrath/twython/tree/master
 Author: Ryan McGrath
diff --git a/twython.egg-info/SOURCES.txt b/twython.egg-info/SOURCES.txt
index dae5317..3a6ce67 100644
--- a/twython.egg-info/SOURCES.txt
+++ b/twython.egg-info/SOURCES.txt
@@ -1,7 +1,6 @@
 README
 setup.py
 twython.py
-twython2k.py
 twython.egg-info/PKG-INFO
 twython.egg-info/SOURCES.txt
 twython.egg-info/dependency_links.txt
diff --git a/twython.egg-info/top_level.txt b/twython.egg-info/top_level.txt
index c2e6662..292a670 100644
--- a/twython.egg-info/top_level.txt
+++ b/twython.egg-info/top_level.txt
@@ -1 +1 @@
-twython2k
+twython
diff --git a/twython2k.py b/twython.py
similarity index 99%
rename from twython2k.py
rename to twython.py
index 051884c..456b6c8 100644
--- a/twython2k.py
+++ b/twython.py
@@ -18,7 +18,7 @@ from urlparse import urlparse
 from urllib2 import HTTPError
 
 __author__ = "Ryan McGrath <ryan@venodesigns.net>"
-__version__ = "0.5"
+__version__ = "0.6"
 
 """Twython - Easy Twitter utilities in Python"""
 
diff --git a/twython3k.py b/twython3k.py
index 93e2e06..fdcc081 100644
--- a/twython3k.py
+++ b/twython3k.py
@@ -15,7 +15,7 @@ import http.client, urllib, urllib.request, urllib.error, urllib.parse, mimetype
 from urllib.error import HTTPError
 
 __author__ = "Ryan McGrath <ryan@venodesigns.net>"
-__version__ = "0.5"
+__version__ = "0.6"
 
 try:
 	import simplejson