Pull request for issue #185

Fixes #185. Generated by conveyor-workflow.