Pull request for issue #156

Fixes #156. Generated by conveyor-workflow.