Fixes issue28.
Merge pull request #34 from superstator/issue28

Fixes issue28.