Pull request for issue #74

Fixes #74. Generated by conveyor-workflow.