Renaming pt1
Renaming pt2
Merge branch 'master' into parallelize