Pull request for issue #178

Fixes #178. Generated by conveyor-workflow.