part 1 complete
Merge branches 'master' and 'part-1-setup'