Pull request for issue #209

Fixes #209. Generated by conveyor-workflow.