Pull request for issue #100

Fixes #100. Generated by conveyor-workflow.