Pull request for issue #68

Fixes #68. Generated by conveyor-workflow.