System MPI includes
Merge pull request #95 from eile/master

System MPI includes