Merge pull request #382 from pepr/master

[cs] synchronized with the original