minor edits
Merge pull request #4 from scopatz/master

Some minor updates