Fixed C++ MPI recognition.
Merge branch 'master' into Merged_EK

Updated branch with latest master