Pull request for issue #59

Fixes #59. Generated by conveyor-workflow.