Pull request for issue #98

Fixes #98. Generated by conveyor-workflow.