Pull request for issue #51

Fixes #51. Generated by conveyor-workflow.