Adding mpi support
Clean