Fixes #48
Merge pull request #49 from matak/master

Fixes #48