New setup.py code, will probably remove
Merge remote-tracking branch 'origin/dev' into dev