Pull request for issue #153

Fixes #153. Generated by conveyor-workflow.