Pull request for issue #118

Fixes #118. Generated by conveyor-workflow.