diff --git a/buildout.cfg b/buildout.cfg
index 2ebe7e7..5916dd2 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -25,25 +25,25 @@ eggs =
 interpreter = python
 
 [versions]
-cov-core = 1.14.0
-coverage = 3.7.1
-coveralls = 0.4.2
+cov-core=1.15.0
+coverage=5.5
+coveralls=3.2.0
 docopt = 0.6.2
 fowler.switchboard = 0.1dev
-future = 0.13.0
-google-ngram-downloader = 3.1.1
-joblib = 0.8.3
-more-itertools = 2.2
-mr.developer = 1.30
-openpyxl = 1.8.6
-opster = 4.1
-progress = 1.2
-py = 1.4.24
-pytest = 2.6.2
-pytest-cov = 1.8.0
-raven = 5.0.0
-seaborn = 0.3.1
+future=0.18.2
+google-ngram-downloader=4.0.1
+joblib=1.0.1
+more-itertools=8.8.0
+mr.developer=2.0.1
+openpyxl=3.0.7
+opster=4.2
+progress=1.6
+py=1.10.0
+pytest=6.2.4
+pytest-cov=2.12.1
+raven=6.10.0
+seaborn=0.11.1
 xlwt-future = 0.8.0
-zc.buildout = 2.2.1
-zc.recipe.egg = 2.0.1
-zope.cachedescriptors = 4.0.0
+zc.buildout=2.13.4
+zc.recipe.egg=2.0.7
+zope.cachedescriptors=4.3.1
diff --git a/setup.py b/setup.py
index 19029fe..98c52d6 100755
--- a/setup.py
+++ b/setup.py
@@ -6,15 +6,21 @@
 
 
 class PyTest(TestCommand):
+    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+    test_args = []
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = []
+
     def finalize_options(self):
         TestCommand.finalize_options(self)
-        self.test_args = 'test'
+        self.test_args = []
         self.test_suite = True
 
     def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
         import pytest
-        errno = pytest.main(self.test_args)
+        errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
 
@@ -26,7 +32,7 @@ def run_tests(self):
 
 setup(
     name='fowler.corpora',
-    version='0.1',
+    version='0.3',
     description='',
     long_description=long_description,
     # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -36,13 +42,12 @@ def run_tests(self):
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: MIT License',
         'Operating System :: POSIX',
-        'Operating System :: Microsoft :: Windows',
         'Operating System :: MacOS :: MacOS X',
         'Topic :: Utilities',
         'Topic :: Text Processing :: Linguistic',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: Implementation :: CPython',
     ],
     keywords='',
@@ -55,10 +60,10 @@ def run_tests(self):
     include_package_data=True,
     zip_safe=False,
     install_requires=[
+        'blosc',
         'chrono',
         'colored',
         'docutils',
-        'eventlet',
         'execnet',
         'fowler.switchboard',
         'gensim',
@@ -77,7 +82,6 @@ def run_tests(self):
         'progress',
         'py',
         'pygments',
-        'raven',
         'scikit-learn',
         'scipy',
         'seaborn',
@@ -92,12 +96,30 @@ def run_tests(self):
         'nltk>=3.0.0',  # and it's dependencies
         'twython',
     ],
+    extras_require={
+        'raven': ['raven'],
+    },
     entry_points={
         'console_scripts': [
             'corpora = fowler.corpora.main:dispatch',
         ],
+        'fowler.corpus_readers': [
+            'brown = fowler.corpora.bnc.readers:Brown',
+            'bnc = fowler.corpora.bnc.readers:BNC',
+            'bnc-ccg = fowler.corpora.bnc.readers:BNC_CCG',
+            'dep-parsed-ukwac = fowler.corpora.bnc.readers:UKWAC',
+
+            'simlex999 = fowler.corpora.bnc.readers:SimLex999',
+            'men = fowler.corpora.bnc.readers:MEN',
+
+            'gs11 = fowler.corpora.bnc.readers:GS11',
+            'gs12 = fowler.corpora.bnc.readers:GS12',
+            'ks13 = fowler.corpora.bnc.readers:KS13',
+            'phraserel = fowler.corpora.bnc.readers:PhraseRel',
+            'msparaphrase = fowler.corpora.bnc.readers:MSRParaphraseCorpus',
+        ],
     },
-    tests_require=['pytest>=2.4.2', 'pytest-bdd', 'pytest-cov'],
+    tests_require=['pytest>=2.4.2', 'pytest-cov'],
     cmdclass={'test': PyTest},
 
 )