diff --git a/.travis.yml b/.travis.yml
index 0a85bcc..7952b1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,27 @@
-language: python
-sudo: false
-addons:
-  apt:
-    packages:
-    - python-setuptools
-    - python-pip
-    - python-dev
-    - make
-    - build-essential
-    - swig
-    - autoconf
-    - libtool
-    - python3-dev
+os: osx
+language: objective-c
+env:
+  matrix:
+  - PYTHON_VERSION="2.7"
+  - PYTHON_VERSION="3.4"
 
-python:
-- 2.7
+install:
+  - echo "Setting up environment..."
+  - "./travis.osx.sh"
 
 script:
-- "./build.sh picosat-960"
+  - export PYTHON=`which python3`
+  - "./build.sh picosat-960"
+  - if [ ${PYTHON_VERSION} == "2.7" ]; then python setup.py bdist_wheel; fi
+  - if [ ${PYTHON_VERSION} == "3.4" ]; then python3 setup.py bdist_wheel; fi
 
 deploy:
-  provider: pypi
-  user: marco.gario
-  password:
-    secure: "B5rykJvd0ASENuipOIPYGZLaUgeWG525UYDL7lSBdNcv6umGXw+lmy0XqLWlOChMVyFaUb5wXb6z2rakek/Dy5l1Qi/cdUWsreICxpA/x3dQqC3Vrad3uHKvkbj3MIkVCRViQEPLcdl1bgCmScwv61pAajo1tjRZLsK0aZLxSgx7mbgYHSAvdlwfw3E5jXjcCUNmuj39Xb34dTVDUCh29F3lG0weFCyODyeOO5VYvwsn+bQC8lFWo6+wdevAQbegmos2gy9mFt8vaTFA7nV2y1NHsrlZ1A0m4YjsFzuxgTflA0Rwg5gjvF5F3aG8z2o0ylPpeHYIyoa5k9BnA+pmmKXkmBWc7WbUcwFm++LS1oWm2oR4tjnVc7WUKHAameG4wefICjDkCmsDN/5qDS7l3/ujvoHZiIGBI+F7EJy/ps5fy41H4JEt12nC0HznFSlyzeuOof0kOsqJS9NP8TANCrrXxojvTdtgd+fRSRwQGYJdHopH4NlqUDMt3Ipk9/PtNK5njlxRXiux6hOdAPIE6KGDH5nOiC7/0/YFrzVYd6Pd/HfoeX+AdfdSsCnZebyoYkttBMpsbufbCEjW6CU/XSCJktcvgq4hByI2a6ykiSfisndq4/NiYLYBrS3JQ6bQ+QVtDWNI7AVjGDtE993HWaYrNgYoXC7qHzV71b/y+qQ="
-#server: https://testpypi.python.org/pypi
+  skip_cleanup: true
+  provider: releases
+  api_key:
+    secure: bG7mKOIBLrCfzN1GGdPVV+Argmlyd4PguVcYbIqdG+sBeORFR2HRDsP1/pUzAfoazJj6bJURT6Dbp8pNkCfg6WVXZc5yfyAdn4fdj/gxumR0C03AzNnekBPd/SV8b2JYNjA6/dneHxkFrZPVNZYnMW9jAMMviM9OdL3YZAjAl3dOjBwxBL3NZR1GIFHJuw13fAeifLkKoPHDTl7hZqsoFra/ZpYtq40BmuTUNxvPimQFEeZwGq/inOQ4oSXjy2vM0TDuyz7IgCZT4HlBeBUDY98qG2fWpGTj8tb+UBKbwPWKs/VAyUTrGFu6wapYTu7CRWei4tBd4VFXTHzq9ovQpcfRUySU1MgA69t+x4XmogvCc39m2jEWUozDKSi+piQ+SqQsRY0I21SYXlbYKaYNacNu2kyDQE/9TqbK0shvd7ZxAhzXG9ioOz79Ua3LabdZ1CX3jDmDCgDENYgnOcIAvd0GlLUTIIXeKowWfF2hWA+2uJoDnoUqoP6J2Jzl1fk3N+zIijEAdE1a5V8F/cHrA48T0jXKxDsMhHZwtxXatOT4J3a++Jkw89o1Erf4CmrlQWeWYEdB8QKK2E5rc41uygHF0aVchP9LB8Dj4SBfscrhntuUAiuf0BpHoCum1RX4ri5gfyoiI99Za+S8lbiKOv9qxYyP64uHnuYoCVxfcfQ=
+  file: dist/*
   on:
-    all_branches: true
-  distributions: sdist
-  skip_cleanup: true # Need to Preserve generated SWIG
+    tags: true
+    repo: marcogario/pyPicoSAT
+    branch: demo_macosx
diff --git a/travis.osx.sh b/travis.osx.sh
new file mode 100755
index 0000000..ee05be6
--- /dev/null
+++ b/travis.osx.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Setup dependencies for TRAVIS
+
+brew update
+brew install swig
+if [ ${PYTHON_VERSION} == "2.7" ];
+then
+    brew install python;
+    pip install wheel
+fi
+if [ ${PYTHON_VERSION} == "3.4" ];
+then
+    brew install python3;
+    pip3 install wheel
+fi