Fixes issue #145
Merge pull request #6 from Areloch/Issue_145

Fixes issue #145