Fixes #555
Merge pull request #901 from pigulla/master

Fixes #555