Fixes #8
fixes #9
Merge pull request #10 from gregcaporaso/issue-8

Fixes #8 and #9