Fix #37
Merge pull request #46 from 0674272bac/0674272bac/issue-37

Fix #37