Fixes #72
(cherry picked from commit 0592b52)
Merge pull request #74 from broadinstitute/issue_72

Fixes #72