Backport of pull request 156 to master