Merge pull request #3 from benighted/master

Merge with upstream.
Merge pull request #8 from trollandtoad/master

Merge pull request #3 from benighted/master