Fixes issue #39
Merge pull request #40 from akkie/master

Fixes issue #39