Pull request for issue #121

Fixes #121. Generated by conveyor-workflow.