Merge pull request #4 from robertdavidgraham/master

Sync with upstream