Pull request for issue #141

Fixes #141. Generated by conveyor-workflow.