Fixes #23
Merge pull request #24 from michaelnorcross/23-tahoe

Fixes #23