Fixing minor typos
Merge remote-tracking branch 'upstream/master'
Merging updates on matz
Merge pull request #4 from deitrick/master

Fixing minor typos