copy edit
Merge pull request #8 from jonlong/master

copy edit