Clean up a few nits before starting.
Merge pull request #6 from hildjj/master

Clean up a few nits before starting.