Pull request for issue #205

Fixes #205. Generated by conveyor-workflow.