Andrew

Include SPMP r1 into the master branch.