Fixes #89
Merge pull request #98 from SpiderOak/issue-89

Fixes #89