Merge pull request #1 from michaelck/master

Initial Edits
Merge remote-tracking branch 'upstream/master'