Pull request for issue #78

Fixes #78. Generated by conveyor-workflow.