Moar edits.
Merge pull request #2 from eliperelman/patch-1

Moar edits.