Pull request for issue #57

Fixes #57. Generated by conveyor-workflow.