Pull request for issue #133

Fixes #133. Generated by conveyor-workflow.