Pull request for issue #194

Fixes #194. Generated by conveyor-workflow.