Merge pull request #1 from RBigData/master

update
update for mpiP
Merge pull request #12 from snoweye/master

update for mpiP