Part 2 finished
Part 3 finished
Merge remote-tracking branch 'github/master'