Merge pull request #3 from benighted/master

Merge with upstream.