See #586
Merge pull request #587 from Nienhaus/master

See #586