Merge with bugfix-0.5
/setup.py