Pull request for issue #243

Fixes #243. Generated by conveyor-workflow.