Pull request for issue #94

Fixes #94. Generated by conveyor-workflow.