diff --git a/MANIFEST.in b/MANIFEST.in
index c4bf456..016fb27 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
-include README.rst
\ No newline at end of file
+# Include the license file
+include LICENSE.txt
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 21035fd..c51733d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,23 +1,23 @@
 from setuptools import setup, find_packages
 
 try:
-    from distutils.command.build_py import build_py_2to3 as build_py
+    from pypandoc import convert
 except ImportError:
-    from distutils.command.build_py import build_py
-    
-def readme():
-    with open('README.md') as f:
-        return f.read()
+    warnings.append("warning: pypandoc module not found, could not convert Markdown to RST")
+    import codecs
+    read_md = lambda f: codecs.open(f, 'r', 'utf-8').read()
+else:
+    read_md = lambda f: convert(f, 'rst')
 
 setup(name='ezclimate',
-      version='1.0.1',
+      version='1.2.0b1',
       description='EZ-Climate model',
-      long_description=readme(),
+      long_description=read_md('README.md'),
       classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3, 2',
-        'Topic :: Climat Change :: Pricing SCC',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4'
       ],
       keywords='EZ-climate, social cost of carbon, SCC, climate pricing',
       url='http://github.com/Litterman/EZClimate',
@@ -26,8 +26,6 @@ def readme():
       packages=find_packages(),
       install_requires=['numpy',],
       include_package_data=False,
-      zip_safe=True,
-      cmdclass = {'build_py': build_py},
-      use_2to3=True
+      zip_safe=True
       )