Pull request for issue #50

Fixes #50. Generated by git-convey.