Pull request for issue #147

Fixes #147. Generated by conveyor-workflow.