Merge pull request #338 from stefanbeller/master

Fixes #333