A few updates and suggestions.
Merge pull request #2 from bakercp/master

A few updates and suggestions.