fix setup.py
Merge branch 'experimental'