Fixes issue49.
Merge pull request #51 from superstator/issue49

Fixes issue49.