Fixes #52.
Merge pull request #59 from superstator/issue52

Fixes #52.