fix setup
Merge branch 'Nima-Ghods' into NEW-MASTER