diff --git a/crossplane/__init__.py b/crossplane/__init__.py
index b5d1338..a237f1a 100644
--- a/crossplane/__init__.py
+++ b/crossplane/__init__.py
@@ -10,7 +10,7 @@
 __summary__ = 'Reliable and fast NGINX configuration file parser.'
 __url__ = 'https://github.com/nginxinc/crossplane'
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 
 __author__ = 'Arie van Luttikhuizen'
 __email__ = 'aluttik@gmail.com'
diff --git a/setup.py b/setup.py
index bf7faef..e85fa6d 100644
--- a/setup.py
+++ b/setup.py
@@ -7,11 +7,11 @@
 import shutil
 import sys
 
-from setuptools import setup, Command
+from setuptools import find_packages, setup, Command
 
 from crossplane import (
     __title__, __summary__, __url__, __version__, __author__, __email__,
-    __package__, __license__
+    __license__
 )
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -64,7 +64,7 @@ def run(self):
     author=__author__,
     author_email=__email__,
     url=__url__,
-    packages=[__package__],
+    packages=find_packages(exclude=['tests']),
     license=__license__,
     classifiers=[
         'Development Status :: 3 - Alpha',