merge w. giulio (master)

remove "cigar" and put under MPI