Pull request for issue #93

Fixes #93. Generated by conveyor-workflow.