added MP upgrade changes to Fix-1f branch
Merge pull request #10 from stevesong/Fix-1f

added MP upgrade changes to Fix-1f branch