Pull request for issue #151

Fixes #151. Generated by conveyor-workflow.