Merge pull request #62 from blabaere/master

Fixes issue #61
Merge remote-tracking branch 'upstream/master'