Pull request for issue #199

Fixes #199. Generated by conveyor-workflow.