Pull request for issue #135

Fixes #135. Generated by conveyor-workflow.