Filling in some of the blanks
Merge remote-tracking branch 'origin/master'