Fixes issue60
Merge pull request #64 from superstator/issue60

Fixes issue60