fixed setup file
Merge branches 'master' and 'experimental'