Pull request for issue #60

Fixes #60. Generated by conveyor-workflow.