diff --git a/HISTORY.rst b/HISTORY.rst
index 0b60fb1b..62fff1e9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,14 @@
 History
 -------
 
+0.2.4 (2011-02-15)
+++++++++++++++++++
+
+* Python 2.5 Support
+* PyPy-c v1.4 Support
+* Auto-Authentication tests
+* Improved Request object constructor
+
 0.2.3 (2011-02-15)
 ++++++++++++++++++
 
diff --git a/README.rst b/README.rst
index 325c69ca..9fc05afd 100644
--- a/README.rst
+++ b/README.rst
@@ -140,8 +140,10 @@ If you'd like to contribute, simply fork `the repository`_, commit your changes
 Roadmap
 -------
 
-- Sphinx Documentation
-- Exhaustive Unittests
+- Sphinx Documentation (http://code.kennethreitz.com/requests/)
+- Exhaustive unit tests
+- Get rid of Poster (gets really nasty in py3.x)
+- Python 3.x Support
 
 .. _`the repository`: http://github.com/kennethreitz/requests
 .. _AUTHORS: http://github.com/kennethreitz/requests/blob/master/AUTHORS
diff --git a/requests/__init__.py b/requests/__init__.py
index b6e3841f..d44b2667 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from . import packages
-from .core import *
+import packages
+from core import *
+
+from core import __version__
diff --git a/requests/core.py b/requests/core.py
index cd2e764c..9292a9a6 100644
--- a/requests/core.py
+++ b/requests/core.py
@@ -34,8 +34,8 @@ from .packages.poster.streaminghttp import register_openers
 
 
 __title__ = 'requests'
-__version__ = '0.2.3'
-__build__ = 0x000203
+__version__ = '0.2.4'
+__build__ = 0x000204
 __author__ = 'Kenneth Reitz'
 __license__ = 'ISC'
 __copyright__ = 'Copyright 2011 Kenneth Reitz'
@@ -177,7 +177,7 @@ class Request(object):
                     self._build_response(resp)
                     self.response.ok = True
 
-                except urllib2.HTTPError as why:
+                except urllib2.HTTPError, why:
                     self._build_response(why)
                     self.response.error = why
 
@@ -209,7 +209,7 @@ class Request(object):
                     self._build_response(resp)
                     self.response.ok = True
 
-                except urllib2.HTTPError as why:
+                except urllib2.HTTPError, why:
                     self._build_response(why)
                     self.response.error = why
 
@@ -242,7 +242,7 @@ class Request(object):
                     self._build_response(resp)
                     self.response.ok = True
 
-                except urllib2.HTTPError as why:
+                except urllib2.HTTPError, why:
                     self._build_response(why)
                     self.response.error = why
         
diff --git a/setup.py b/setup.py
index 4df796ea..edf89f1d 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 
 import os
 import sys
+import requests
 
 from distutils.core import setup
 
@@ -22,7 +23,7 @@ required = []
 
 setup(
     name='requests',
-    version='0.2.3',
+    version=requests.__version__,
     description='Awesome Python HTTP Library that\'s actually usable.',
     long_description=open('README.rst').read() + '\n\n' +
                      open('HISTORY.rst').read(),
@@ -37,12 +38,12 @@ setup(
     install_requires=required,
     license='ISC',
     classifiers=(
-        # 'Development Status :: 5 - Production/Stable',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: ISC License (ISCL)',
         'Programming Language :: Python',
-        # 'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         # 'Programming Language :: Python :: 3.0',
diff --git a/test_requests.py b/test_requests.py
index 7ea35343..e365c6ef 100644
--- a/test_requests.py
+++ b/test_requests.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import unittest
-from cStringIO import StringIO
 
 import requests
 
@@ -49,6 +48,16 @@ class RequestsTestSuite(unittest.TestCase):
         self.assertEqual(r.status_code, 200)
 
 
+        requests.add_autoauth(url, auth)
+
+        r = requests.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        # reset auto authentication
+        requests.AUTOAUTHS = []
+
+
+
     def test_POSTBIN_GET_POST_FILES(self):
 
         bin = requests.post('http://www.postbin.org/')
@@ -57,7 +66,7 @@ class RequestsTestSuite(unittest.TestCase):
         post = requests.post(bin.url, data={'some': 'data'})
         self.assertEqual(post.status_code, 201)
 
-        post2 = requests.post(bin.url, files={'some': StringIO('data')})
+        post2 = requests.post(bin.url, files={'some': open('test_requests.py')})
         self.assertEqual(post2.status_code, 201)
 
 
diff --git a/test_suite.sh b/test_suite.sh
deleted file mode 100755
index 86f8cd30..00000000
--- a/test_suite.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-tox 
-coverage xml
-rm -fr pylint.txt
-pylint -d W0312 -d W0212 -d E1101 -d E0202 -d W0102 -d E0102 -f parseable ./requests > pylint.txt || true
diff --git a/tox.ini b/tox.ini
index 7c7d8552..4999d6a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
-envlist = py24,py25,py26,py27
+envlist = py25,py26,py27,pypy
 
 [testenv]
 commands=py.test --junitxml=junit-{envname}.xml
 deps = 
-    pytest
\ No newline at end of file
+    pytest
+
+[testenv:pypy]
+basepython=/usr/bin/pypy-c
+