Fixes #40
Merge pull request #42 from pobocks/master

Fixes #40