cosmetic intervention
Typos
Merge branch 'master' into master-mine
Merge pull request #89 from rixbeck/master

Cosmetic intervention