Pull request for issue #114

Fixes #114. Generated by conveyor-workflow.