Trying to reduce ambiguity.

Just a few changes that I think would've helped me when I got started.
If they would've helped me, maybe they'll help others.
Merge pull request #5 from robwilkerson/master

Trying to reduce ambiguity.