Pull request for issue #131

Fixes #131. Generated by conveyor-workflow.