minor edits
Merge pull request #1 from nathanstilwell/master

minor edits