First round of edits
Pulled upstream changes
Merge pull request #1 from brannondorsey/master

First round of edits for section 1