Fixes #58
Merge pull request #82 from ustroetz/master

Fixes #58