Update setup.py
Merge branch '0.1'