corrections in load
Merge remote-tracking branch 'origin/Parallel' into Parallel