diff --git a/.gitignore b/.gitignore
index eca87e2..55f127b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,12 @@
+*.mpy
+.idea
 __pycache__
 _build
 *.pyc
 .env
 build*
 bundles
-.cache
+*.DS_Store
+.eggs
+dist
+**/*.egg-info
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 43c5d6d..5c46519 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,34 @@
-# This is a common .travis.yml for generating library release zip files for
-# CircuitPython library releases using circuitpython-build-tools.
-# See https://github.com/adafruit/circuitpython-build-tools for detailed setup
-# instructions.
-
 dist: trusty
 sudo: false
 language: python
 python:
-    - "3.6"
-
+- '3.6'
 cache:
-    pip: true
-
+  pip: true
 deploy:
   provider: releases
-  api_key: $GITHUB_TOKEN
+  api_key: "$GITHUB_TOKEN"
   file_glob: true
-  file: $TRAVIS_BUILD_DIR/bundles/*
+  file: "$TRAVIS_BUILD_DIR/bundles/*"
   skip_cleanup: true
   overwrite: true
   on:
     tags: true
-
+- provider: pypi
+  user: adafruit-travis
+  on:
+    tags: true
+  password:
+    secure: iKDWK57s7OwFESszMErxp85hsKMvwsv6Co7oihwEqt0bibwrm7Xzqr4XaEABKUfx7No9/JqhEkaKRyU/Pry4cf5KYXDbEA9ctDiZaT3CxhzFeU5EXNzr2Q+KjseuKG76rU90TIaIZKGYzVMVjeis9f5Feqf3ZRp6egRDALuZz172abYXO4vxIuVLPbCFoANGP7lMeO2HiXutoM5Ch4uA9dLps0W6BEh7qUmDJ4dIybvATavSDDSxI+o1bWnqk8DnDI5XAKR9BZ/PHvwo0pnoRHo8f6wnLn8i5co6Y0NYvFmQAdBF+SiIgFH3ypXqh2cLkXbfoo+zr0/uCpsAkb7EXD86D32PZ/np5H15FOAtT9FQJSkeT+Xf/H3nX5+NYBzBmP8FWEOfnvD7V7+ew1sRBzZ+Hx0rbMq17CNtRmkD+q39n35kR6KmvmLzjncqaJVff9CHZQqZeHMejWUVreVN0rzffvjSe5fbKO6ATYBK/1JE5t2D/yS5/vfHs46b6oJIOE+Owd5Qo3bDFUwzeA6CVskAtEHXyMjuWmYNkP+g/qR8NLwQmsvci2tl9KZ+hhAE74ClBmAmlO4ekqeuirneJow6nzNdEngvzmete54BrnHiMgRdPO2bFFrQ2WwDGSoDywGUUr6Z9xnVO+sgHm1+P031uz20NtSg7ogB3CCCyNU=
 install:
-  - pip install --force-reinstall pylint==1.9.2
-  - pip install circuitpython-build-tools Sphinx sphinx-rtd-theme pytest
-
+- pip install -r requirements.txt
+- pip install --force-reinstall pylint==1.9.2
+- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme pytest
 script:
-  - py.test
-  - pylint adafruit_motor/*.py
-  - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
-  - ([[ ! -d "tests" ]] || pylint --disable=missing-docstring tests/*.py)
-  - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-motor --library_location .
-  - cd docs && sphinx-build -E -W -b html . _build/html
+- py.test
+- pylint adafruit_motor/*.py
+- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
+- ([[ ! -d "tests" ]] || pylint --disable=missing-docstring tests/*.py)
+- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-motor --library_location
+  .
+- cd docs && sphinx-build -E -W -b html . _build/html && cd ..
diff --git a/docs/conf.py b/docs/conf.py
index 42b8b76..121c2aa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@
 # Uncomment the below if you use native CircuitPython modules such as
 # digitalio, micropython and busio. List the modules you use. Without it, the
 # autodoc module docs will fail to generate with a warning.
-autodoc_mock_imports = ["micropython"]
+# autodoc_mock_imports = ["micropython"]
 
 intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
 
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..c84fe4f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,60 @@
+"""A setuptools based setup module.
+
+See:
+https://packaging.python.org/en/latest/distributing.html
+https://github.com/pypa/sampleproject
+"""
+
+# Always prefer setuptools over distutils
+from setuptools import setup, find_packages
+# To use a consistent encoding
+from codecs import open
+from os import path
+
+here = path.abspath(path.dirname(__file__))
+
+# Get the long description from the README file
+with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
+setup(
+    name='adafruit-circuitpython-motor',
+
+    use_scm_version=True,
+    setup_requires=['setuptools_scm'],
+
+    description='CircuitPython helper library provides higher level objects to control motors and servos.',
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
+
+    # The project's main homepage.
+    url='https://github.com/adafruit/Adafruit_CircuitPython_Motor',
+
+    # Author details
+    author='Adafruit Industries',
+    author_email='circuitpython@adafruit.com',
+
+    install_requires=['Adafruit-Blinka'],
+
+    # Choose your license
+    license='MIT',
+
+    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: System :: Hardware',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+    ],
+
+    # What does your project relate to?
+    keywords='adafruit servo stepper motor hardware micropython circuitpython',
+
+    # You can just specify the packages manually here if your project is
+    # simple. Or you can use find_packages().
+    packages=['adafruit_motor'],
+)
\ No newline at end of file