Pull request for issue #96

Fixes #96. Generated by conveyor-workflow.