Fixes #346
Merge pull request #349 from zyxar/master

Fixes #346