Added support for MPICH 2.